Fix compile errors in nt/inc/sys/time.h when using nt/configure.bat.

 nt/inc/sys/time.h (gettimeofday): Use '__restrict' instead of
 'restrict', which is a C99 extension.  See
 http://lists.gnu.org/archive/html/emacs-devel/2013-05/msg00588.html
 and the following discussion for the problem this caused in the
 old nt/configure.bat build.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 781dfbb7c3fe9803d6ce75521bfd5213a50e19a0..c9fe372a4a23de3b1976c1a7f24cb6422278b49f 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
+2013-05-31  Eli Zaretskii  <eliz@gnu.org>
+
+       * inc/sys/time.h (gettimeofday): Use '__restrict' instead of
+       'restrict', which is a C99 extension.  See
+       http://lists.gnu.org/archive/html/emacs-devel/2013-05/msg00588.html
+       and the following discussion for the problem this caused in the
+       old nt/configure.bat build.
+
 2013-05-29  Eli Zaretskii  <eliz@gnu.org>
 
        * Makefile.in (emacs.res): Include srcdir when preprocessing

diff --git a/nt/inc/sys/time.h b/nt/inc/sys/time.h
index 87ad9d3ff0d0cf7f11e6b022742464ac878ac5c0..e586aaee07edcfd25575b5f4c040ee0b60b58cf0 100644 (file)
--- a/nt/inc/sys/time.h
+++ b/nt/inc/sys/time.h
@@ -35,10 +35,15 @@ 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.  See
-   m4/gettimeofday.m4.  */
-int gettimeofday (struct timeval *restrict, struct timezone *restrict);
+   the configure test for the type of the second argument; see
+   m4/gettimeofday.m4.  We use '__restrict' here, rather than
+   'restrict', for the benefit of the old nt/configure.bat build,
+   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);
 
 #define ITIMER_REAL      0
 #define ITIMER_PROF      1