diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2017-05-15 22:45:57 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2017-05-15 22:45:57 +0300 |
| commit | 3241c84fd8cfa1e02472e52e6aefe2fff0726b3d (patch) | |
| tree | df8eae184ba8cd8ae44c19f298c7c200a548b2fe /nt | |
| parent | d23a486ba27405acfda67a4dc387ade5e399a29b (diff) | |
| download | emacs-3241c84fd8cfa1e02472e52e6aefe2fff0726b3d.tar.gz | |
Remove unneeded stuff from nt/inc/sys/time.h
* nt/inc/sys/time.h (_TIMEVAL_DEFINED, struct timevat, timerisset)
(timercmp, timerclear): Don't define. Instead, include the system
header sys/time.h, and add only the interval timers stuff. This
avoids compiler warnings about 'gettimeofday's prototype, and also
avoids redefinition of macros from system headers.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/inc/sys/time.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/nt/inc/sys/time.h b/nt/inc/sys/time.h index de06c116ced..6f67e5db4ed 100644 --- a/nt/inc/sys/time.h +++ b/nt/inc/sys/time.h @@ -1,29 +1,7 @@ #ifndef SYS_TIME_H_INCLUDED #define SYS_TIME_H_INCLUDED -/* - * sys/time.h either doesn't exist on Windows, or doesn't necessarily - * have the below stuff. - */ - -/* The guards are for MinGW64, which defines these structs on its - system headers which are included by ms-w32.h. */ -/* 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 -#define _TIMEVAL_DEFINED -struct timeval -{ - long tv_sec; /* seconds */ - long tv_usec; /* microseconds */ -}; -#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec) -#define timercmp(tvp, uvp, cmp) \ - (((tvp)->tv_sec != (uvp)->tv_sec) ? \ - ((tvp)->tv_sec cmp (uvp)->tv_sec) : \ - ((tvp)->tv_usec cmp (uvp)->tv_usec)) -#define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0 -#endif /* _TIMEVAL_DEFINED */ +#include_next <sys/time.h> #define ITIMER_REAL 0 #define ITIMER_PROF 1 |