Attempt to resolve gettimeofday compilation errors with MinGW64.

 src/w32.c (gettimeofday): Make the signature identical to prototype
 in nt/inc/sys/time.h.

 nt/inc/sys/time.h (struct timeval): Remove the _W64 guards.

2 files changed, 4 insertions, 2 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 646b472ba73..b5322f51030 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/sys/time.h (struct timeval): Remove the _W64 guards.
+
 2013-06-01  Eli Zaretskii  <eliz@gnu.org>
 
         * inc/sys/time.h [!_TIMEZONE_DEFINED]: Define _TIMEZONE_DEFINED to
diff --git a/nt/inc/sys/time.h b/nt/inc/sys/time.h
index 308748437d4..f8fb022d221 100644
--- a/nt/inc/sys/time.h
+++ b/nt/inc/sys/time.h
@@ -8,7 +8,6 @@
 
 /* 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
@@ -25,7 +24,6 @@ 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
 #define _TIMEZONE_DEFINED