procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Eli Zaretskii 2013-05-31 11:47:18 +03:00
parent e26aac1f93
commit 2a157a5d33
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nt/ChangeLog
View file

@ -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

11
nt/inc/sys/time.h
View file

@ -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