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, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2b719b068ae..a1aa4efcc86 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32.c (gettimeofday): Make the signature identical to prototype
+        in nt/inc/sys/time.h.
+
 2013-06-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * eval.c (backtrace_p, backtrace_top, backtrace_next): Export them to
diff --git a/src/w32.c b/src/w32.c
index 7d63c73eb18..7a39a617ee3 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -2452,7 +2452,7 @@ get_emacs_configuration_options (void)
 
 /* Emulate gettimeofday (Ulrich Leodolter, 1/11/95).  */
 int
-gettimeofday (struct timeval *restrict tv, struct timezone *restrict tz)
+gettimeofday (struct timeval *__restrict tv, struct timezone *__restrict tz)
 {
   struct _timeb tb;
   _ftime (&tb);