diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-06-03 20:15:44 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-06-03 20:15:44 +0300 |
| commit | e2d8a6f0a229b4ebe26484b892ec4f14888f58b6 (patch) | |
| tree | 7737e85964517cd7a183e777c9c96860f193cecf | |
| parent | 22bcd514bc7f1cca2119dc67c8387608a295ee4d (diff) | |
| download | emacs-e2d8a6f0a229b4ebe26484b892ec4f14888f58b6.tar.gz | |
Attempt to resolve gettimeofday compilation errors with MinGW64.
src/w32.c (gettimeofday): Make the signature identical to prototype
in nt/inc/sys/time.h.
nt/inc/sys/time.h (struct timeval): Remove the _W64 guards.
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/inc/sys/time.h | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/w32.c | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 646b472ba73..b5322f51030 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2013-06-03 Eli Zaretskii <eliz@gnu.org> + + * inc/sys/time.h (struct timeval): Remove the _W64 guards. + 2013-06-01 Eli Zaretskii <eliz@gnu.org> * inc/sys/time.h [!_TIMEZONE_DEFINED]: Define _TIMEZONE_DEFINED to diff --git a/nt/inc/sys/time.h b/nt/inc/sys/time.h index 308748437d4..f8fb022d221 100644 --- a/nt/inc/sys/time.h +++ b/nt/inc/sys/time.h @@ -8,7 +8,6 @@ /* The guards are for MinGW64, which defines these structs on its system headers which are included by ms-w32.h. */ -#ifndef _W64 /* Allow inclusion of sys/time.h and winsock2.h in any order. Needed for running the configure test, which is only relevant to MinGW. */ #ifndef _TIMEVAL_DEFINED @@ -25,7 +24,6 @@ struct timeval ((tvp)->tv_usec cmp (uvp)->tv_usec)) #define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0 #endif /* _TIMEVAL_DEFINED */ -#endif /* _W64 */ #ifndef _TIMEZONE_DEFINED #define _TIMEZONE_DEFINED diff --git a/src/ChangeLog b/src/ChangeLog index 2b719b068ae..a1aa4efcc86 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-06-03 Eli Zaretskii <eliz@gnu.org> + + * w32.c (gettimeofday): Make the signature identical to prototype + in nt/inc/sys/time.h. + 2013-06-03 Stefan Monnier <monnier@iro.umontreal.ca> * eval.c (backtrace_p, backtrace_top, backtrace_next): Export them to diff --git a/src/w32.c b/src/w32.c index 7d63c73eb18..7a39a617ee3 100644 --- a/src/w32.c +++ b/src/w32.c @@ -2452,7 +2452,7 @@ get_emacs_configuration_options (void) /* Emulate gettimeofday (Ulrich Leodolter, 1/11/95). */ int -gettimeofday (struct timeval *restrict tv, struct timezone *restrict tz) +gettimeofday (struct timeval *__restrict tv, struct timezone *__restrict tz) { struct _timeb tb; _ftime (&tb); |