[Emacs-diffs] /srv/bzr/emacs/trunk r112836: Attempt to resolve gettimeofday compilation errors with MinGW64.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112836
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2013-06-03 20:15:44 +0300
message:
  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.
modified:
  nt/ChangeLog
  nt/inc/sys/time.h
  src/ChangeLog
  src/w32.c

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2013-06-01 07:07:22 +0000
+++ b/nt/ChangeLog      2013-06-03 17:15:44 +0000
@@ -1,3 +1,7 @@
+2013-06-03  Eli Zaretskii  <address@hidden>
+
+       * inc/sys/time.h (struct timeval): Remove the _W64 guards.
+
 2013-06-01  Eli Zaretskii  <address@hidden>
 
        * inc/sys/time.h [!_TIMEZONE_DEFINED]: Define _TIMEZONE_DEFINED to

=== modified file 'nt/inc/sys/time.h'
--- a/nt/inc/sys/time.h 2013-06-01 07:07:22 +0000
+++ b/nt/inc/sys/time.h 2013-06-03 17:15:44 +0000
@@ -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 @@
         ((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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-06-03 15:18:18 +0000
+++ b/src/ChangeLog     2013-06-03 17:15:44 +0000
@@ -1,3 +1,8 @@
+2013-06-03  Eli Zaretskii  <address@hidden>
+
+       * w32.c (gettimeofday): Make the signature identical to prototype
+       in nt/inc/sys/time.h.
+
 2013-06-03  Stefan Monnier  <address@hidden>
 
        * eval.c (backtrace_p, backtrace_top, backtrace_next): Export them to

=== modified file 'src/w32.c'
--- a/src/w32.c 2013-04-15 13:39:41 +0000
+++ b/src/w32.c 2013-06-03 17:15:44 +0000
@@ -2452,7 +2452,7 @@
 
 /* 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);