diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-07-27 15:16:06 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-07-27 15:16:06 +0300 |
| commit | 70096743d5bed2c4c0221da32ebf824ad6a262c5 (patch) | |
| tree | 993be5217857a47bffae2be1202f5fb7df7860b6 /lib/time.in.h | |
| parent | 075f8d9626dca1e14ca1772d25f477e13045adf4 (diff) | |
| download | emacs-70096743d5bed2c4c0221da32ebf824ad6a262c5.tar.gz | |
MS-Windows follow-up for recent TZ-related changes
* nt/mingw-cfg.site (ac_cv_header_pthread_h)
(gl_cv_sys_struct_timespec_in_pthread_h): Force to "no", to avoid
picking up 'struct timespec' from pthread.h, if it is installed on
the user's system. We want either the definitions from MinGW
system headers, if available, or the Gnulib replacements if not.
* nt/inc/ms-w32.h <struct timespec>: Don't define, as we now use
lib/time.h.
* lib/time.in.h: Don't let __need_* symbols affect what happens on
MinGW. These symbols are defined by MinGW system headers, but we
don't want that to affect whether Gnulib portions of the header
are or aren't used.
Diffstat (limited to 'lib/time.in.h')
| -rw-r--r-- | lib/time.in.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/time.in.h b/lib/time.in.h index a983f498e51..1adfe925398 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -24,9 +24,11 @@ declare a few standard symbols, rather than to declare all the symbols. Also, Solaris 8 <time.h> eventually includes itself recursively; if that is happening, just include the system <time.h> - without adding our own declarations. */ -#if (defined __need_time_t || defined __need_clock_t \ - || defined __need_timespec \ + without adding our own declarations. MinGW system headers use + these symbols as well, but we don't want to exclude MinGW from the + 'else' branch below. */ +#if (((defined __need_time_t || defined __need_clock_t \ + || defined __need_timespec) && !defined __MINGW32__) \ || defined _@GUARD_PREFIX@_TIME_H) # @INCLUDE_NEXT@ @NEXT_TIME_H@ |