Merge from trunk and resolve conflicts.

[gnu-emacs] / nt / inc / sys / time.h

diff --git a/nt/inc/sys/time.h b/nt/inc/sys/time.h
index 2d2c3abe222e82a828edac92c30638e8d02de8d8..aa51041bcd806d32ac692c832001752e068ec03a 100644 (file)
--- a/nt/inc/sys/time.h
+++ b/nt/inc/sys/time.h
@@ -6,6 +6,9 @@
  * have the below stuff.
  */
 
+/* The guards are for MinGW64, which defines these structs on its
+   system headers which are included by ms-w32.h.  */
+#ifndef _W64
 /* Allow inclusion of sys/time.h and winsock2.h in any order.  Needed
    for running the configure test, which is only relevant to MinGW.  */
 #ifndef _TIMEVAL_DEFINED
@@ -22,12 +25,15 @@ struct timeval
         ((tvp)->tv_usec cmp (uvp)->tv_usec))
 #define timerclear(tvp)  (tvp)->tv_sec = (tvp)->tv_usec = 0
 #endif /* _TIMEVAL_DEFINED */
+#endif /* _W64 */
 
+#ifndef _TIMEZONE_DEFINED
 struct timezone
 {
   int          tz_minuteswest; /* minutes west of Greenwich */
   int          tz_dsttime;     /* type of dst correction */
 };
+#endif
 
 void gettimeofday (struct timeval *, struct timezone *);