[Emacs-diffs] /srv/bzr/emacs/trunk r112142: More MinGW64 fixes.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112142
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2013-03-26 16:04:07 +0200
message:
  More MinGW64 fixes.
  
   src/w32.c Move inclusion of time.h before sys/time.h, so that MinGW64 could
   see its own definitions of 'struct timeval' and 'struct timezone'.
modified:
  src/ChangeLog
  src/w32.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-03-26 13:47:58 +0000
+++ b/src/ChangeLog     2013-03-26 14:04:07 +0000
@@ -4,6 +4,8 @@
        Define only for _WIN32_WINNT less than 0x0500.
        (_ANONYMOUS_UNION, _ANONYMOUS_STRUCT) [!_W64]: Don't define for
        MinGW64.
+       Move inclusion of time.h before sys/time.h, so that MinGW64 could
+       see its own definitions of 'struct timeval' and 'struct timezone'.
 
        Fix incompatibilities between MinGW.org and MinGW64 headers.
        * w32term.c (WCRANGE, GLYPHSET): Don't define if _W64 is defined.

=== modified file 'src/w32.c'
--- a/src/w32.c 2013-03-26 13:45:01 +0000
+++ b/src/w32.c 2013-03-26 14:04:07 +0000
@@ -29,10 +29,10 @@
 #include <ctype.h>
 #include <signal.h>
 #include <sys/file.h>
+#include <time.h>      /* must be before nt/inc/sys/time.h, for MinGW64 */
 #include <sys/time.h>
 #include <sys/utime.h>
 #include <math.h>
-#include <time.h>
 
 /* must include CRT headers *before* config.h */