diff options
| author | Eli Zaretskii | 2013-03-26 10:21:27 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-03-26 10:21:27 +0200 |
| commit | b88b62dec99cec327c6bae67ef4d3a8bc5b601ca (patch) | |
| tree | 2d3d5acaabe9d9e124c90bfae57bddf3dc355c19 /nt/ChangeLog | |
| parent | 69b2c07eaf592dee54ccd9bdb5f38dce88d1f221 (diff) | |
| download | emacs-b88b62dec99cec327c6bae67ef4d3a8bc5b601ca.tar.gz emacs-b88b62dec99cec327c6bae67ef4d3a8bc5b601ca.zip | |
Fix more incompatibilities between MinGW.org and MinGW64 headers
Reported by ׃scar Fuentes in
http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00699.html
and in
http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00707.html.
nt/inc/ms-w32.h (USE_NO_MINGW_SETJMP_TWO_ARGS) [_W64]: Define to 1.
For MinGW64, include sys/types.h and time.h.
nt/inc/sys/time.h (struct timeval) [!_W64]: Guard definition with _W64.
(struct timezone) [!_TIMEZONE_DEFINED]: Guard definition with
_TIMEZONE_DEFINED.
nt/addpm.c (_WIN32_IE) [_W64]: For MinGW64, don't define to 0x400.
nt/inc/sys/stat.h: Remove _CRTIMP from prototypes of fstat, stat,
lstat, and fstatat.
lib-src/ntlib.c (struct timespec) [!_TIMEZONE_DEFINED]: Define the
struct only if _TIMEZONE_DEFINED is not defined.
src/w32term.c (WCRANGE, GLYPHSET): Don't define if _W64 is defined.
src/w32.c (REPARSE_DATA_BUFFER): Guard with
MAXIMUM_REPARSE_DATA_BUFFER_SIZE being defined.
Diffstat (limited to 'nt/ChangeLog')
| -rw-r--r-- | nt/ChangeLog | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 20579d36c79..f4fa0a7ee53 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,23 @@ | |||
| 1 | 2013-03-26 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | Fix more incompatibilities between MinGW.org and MinGW64 headers | ||
| 4 | reported by Óscar Fuentes in | ||
| 5 | http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00699.html | ||
| 6 | and in | ||
| 7 | http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00707.html. | ||
| 8 | * inc/ms-w32.h (USE_NO_MINGW_SETJMP_TWO_ARGS) [_W64]: Define to 1. | ||
| 9 | For MinGW64, include sys/types.h and time.h. | ||
| 10 | |||
| 11 | * inc/sys/time.h (struct timeval) [!_W64]: Guard definition with | ||
| 12 | _W64. | ||
| 13 | (struct timezone) [!_TIMEZONE_DEFINED]: Guard definition with | ||
| 14 | _TIMEZONE_DEFINED. | ||
| 15 | |||
| 16 | * addpm.c (_WIN32_IE) [_W64]: For MinGW64, don't define to 0x400. | ||
| 17 | |||
| 18 | * inc/sys/stat.h: Remove _CRTIMP from prototypes of fstat, stat, | ||
| 19 | lstat, and fstatat. | ||
| 20 | |||
| 1 | 2013-03-25 Eli Zaretskii <eliz@gnu.org> | 21 | 2013-03-25 Eli Zaretskii <eliz@gnu.org> |
| 2 | 22 | ||
| 3 | Fix incompatibilities between MinGW.org and MinGW64 headers | 23 | Fix incompatibilities between MinGW.org and MinGW64 headers |