andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the MS-Windows build

Browse source 
* nt/inc/sys/time.h (gettimeofday):
* src/w32.c (gettimeofday): Adjust signature to match Gnulib.
This commit is contained in:
Eli Zaretskii 2017-05-14 17:53:39 +03:00
parent 4132bd74e9
commit 3af6909f32
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,7 @@ struct timezone
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);
int gettimeofday (struct timeval *__restrict, void *__restrict);
#define ITIMER_REAL 0
#define ITIMER_PROF 1

6
src/w32.c
View file

@ -2982,7 +2982,7 @@ emacs_root_dir (void)
/* Emulate gettimeofday (Ulrich Leodolter, 1/11/95). */
int
gettimeofday (struct timeval *__restrict tv, struct timezone *__restrict tz)
gettimeofday (struct timeval *__restrict tv, void *__restrict tzv)
{
struct _timeb tb;
_ftime (&tb);
@ -2995,8 +2995,10 @@ gettimeofday (struct timeval *__restrict tv, struct timezone *__restrict tz)
GetTimeZoneInformation, but that doesn't seem necessary, since
Emacs always calls gettimeofday with the 2nd argument NULL (see
current_emacs_time). */
if (tz)
if (tzv)
{
struct timezone *tz = (struct timezone *)tzv;
tz->tz_minuteswest = tb.timezone; /* minutes west of Greenwich */
tz->tz_dsttime = tb.dstflag; /* type of dst correction */
}