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.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 646b472ba736d91ffbcb25c1f21f73e912c0bc9b..b5322f5103059ecfdeec6be20083434335b859b1 100644 (file)
--- 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 308748437d48436a5f90fa21fcc40a7c81f04e01..f8fb022d221c46bd619ca3a1a4266d2aa9522c18 100644 (file)
--- 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

diff --git a/src/ChangeLog b/src/ChangeLog
index 2b719b068ae9532cbe24f8421dadd088b92cc612..a1aa4efcc8627c07882c34232376896ca5d17de6 100644 (file)
--- 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 7d63c73eb18cd7701fc8035741d5974de88088c1..7a39a617ee3ad123270673743304290c5b2863d2 100644 (file)
--- 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);