From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 14 May 2017 14:53:39 +0000 (+0300)
Subject: Fix the MS-Windows build
X-Git-Tag: emacs-26.0.90~521^2~403
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3af6909f3249dc8d74349f000117f7063f71adff;p=emacs.git

Fix the MS-Windows build

* nt/inc/sys/time.h (gettimeofday):
* src/w32.c (gettimeofday): Adjust signature to match Gnulib.
---

diff --git a/nt/inc/sys/time.h b/nt/inc/sys/time.h
index f8fb022d221..88ea32bc808 100644
--- a/nt/inc/sys/time.h
+++ b/nt/inc/sys/time.h
@@ -42,7 +42,7 @@ struct timezone
    which does not force the use of -std= switch to GCC, and that
    causes compilation errors with 'restrict', which is a C99
    extension.  */
-int gettimeofday (struct timeval *__restrict, struct timezone *__restrict);
+int gettimeofday (struct timeval *__restrict, void *__restrict);
 
 #define ITIMER_REAL      0
 #define ITIMER_PROF      1
diff --git a/src/w32.c b/src/w32.c
index f35ad67d829..878b22473a6 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -2982,7 +2982,7 @@ emacs_root_dir (void)
 
 /* Emulate gettimeofday (Ulrich Leodolter, 1/11/95).  */
 int
-gettimeofday (struct timeval *__restrict tv, struct timezone *__restrict tz)
+gettimeofday (struct timeval *__restrict tv, void *__restrict tzv)
 {
   struct _timeb tb;
   _ftime (&tb);
@@ -2995,8 +2995,10 @@ gettimeofday (struct timeval *__restrict tv, struct timezone *__restrict tz)
      GetTimeZoneInformation, but that doesn't seem necessary, since
      Emacs always calls gettimeofday with the 2nd argument NULL (see
      current_emacs_time).  */
-  if (tz)
+  if (tzv)
     {
+      struct timezone *tz = (struct timezone *)tzv;
+
       tz->tz_minuteswest = tb.timezone;	/* minutes west of Greenwich  */
       tz->tz_dsttime = tb.dstflag;	/* type of dst correction  */
     }