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

2 files changed, 8 insertions, 3 deletions

diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index cd183c917c4..6cbec2bdaaf 100644
--- 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 391898ef122..87ad9d3ff0d 100644
--- 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