Use 'restrict' in gettimeofday arguments, and make ms-w32.h compatible.

diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index cd183c917c459c74a57c64e9d1e80959910115ad..6cbec2bdaaf4aa5a5a5552fd2b8ba16da080acd7 100644 (file)
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -99,8 +99,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 #ifdef __GNUC__
-# define restrict __restrict__
+/* config.h may have defined already.  */
+# ifndef restrict
+#  define restrict __restrict__
+# endif
 #else
+  /* FIXME: should we define to __restrict, which MSVC supports? */
 # define restrict
 #endif
 

diff --git a/nt/inc/sys/time.h b/nt/inc/sys/time.h
index 391898ef122e35ca19c1897d99acab4ac8457414..87ad9d3ff0d0cf7f11e6b022742464ac878ac5c0 100644 (file)
--- a/nt/inc/sys/time.h
+++ b/nt/inc/sys/time.h
@@ -36,8 +36,9 @@ struct timezone
 #endif
 
 /* This needs to be compatible with Posix signature, in order to pass
-   the configure test for the type of the second argument.  */
-int gettimeofday (struct timeval *, struct timezone *);
+   the configure test for the type of the second argument.  See
+   m4/gettimeofday.m4.  */
+int gettimeofday (struct timeval *restrict, struct timezone *restrict);
 
 #define ITIMER_REAL      0
 #define ITIMER_PROF      1

diff --git a/src/w32.c b/src/w32.c
index 6933ddfed831206f150ed18faffd3ce37a971119..0fa5970124aa90dcbc5363369770666e4e7680ec 100644 (file)
--- a/src/w32.c
+++ b/src/w32.c
@@ -2395,7 +2395,7 @@ get_emacs_configuration_options (void)
 
 /* Emulate gettimeofday (Ulrich Leodolter, 1/11/95).  */
 int
-gettimeofday (struct timeval *tv, struct timezone *tz)
+gettimeofday (struct timeval *restrict tv, struct timezone *restrict tz)
 {
   struct _timeb tb;
   _ftime (&tb);