From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 26 Mar 2013 14:04:07 +0000 (+0200)
Subject: More MinGW64 fixes.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~526^2~85
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8f5e14c849415e68add0e617277ffa33325b5593;p=emacs.git

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'.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a676dd8f160..ce0455a4981 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/w32.c b/src/w32.c
index 861e578985d..f3c98bf9596 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -29,10 +29,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 */