Commit e2d8a6f0 authored by Eli Zaretskii's avatar Eli Zaretskii

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.
parent 22bcd514
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
......
......@@ -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
......
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
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment