Fix more incompatibilities between MinGW.org and MinGW64 headers

[bpt/emacs.git] / nt / ChangeLog

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 20579d3..f4fa0a7 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,23 @@
+2013-03-26  Eli Zaretskii  <eliz@gnu.org>
+
+       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.
+       * inc/ms-w32.h (USE_NO_MINGW_SETJMP_TWO_ARGS) [_W64]: Define to 1.
+       For MinGW64, include sys/types.h and time.h.
+
+       * inc/sys/time.h (struct timeval) [!_W64]: Guard definition with
+       _W64.
+       (struct timezone) [!_TIMEZONE_DEFINED]: Guard definition with
+       _TIMEZONE_DEFINED.
+
+       * addpm.c (_WIN32_IE) [_W64]: For MinGW64, don't define to 0x400.
+
+       * inc/sys/stat.h: Remove _CRTIMP from prototypes of fstat, stat,
+       lstat, and fstatat.
+
 2013-03-25  Eli Zaretskii  <eliz@gnu.org>
 
        Fix incompatibilities between MinGW.org and MinGW64 headers