diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-02-05 11:41:03 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-02-05 11:41:03 -0800 |
| commit | 06c2ec49462474205dbd79a5dbd96bf73367d949 (patch) | |
| tree | 90a5090472895f15ff1fa9aa0bbe475a914b180c /lib/time.in.h | |
| parent | 81f9a6edde971d8ec7d31cab03a766feb6ae074b (diff) | |
| download | emacs-06c2ec49462474205dbd79a5dbd96bf73367d949.tar.gz | |
Merge from gnulib.
This incorporates:
2014-01-23 pthread: work around winpthread header pollution on mingw
* lib/time.in.h: Update from gnulib.
* doc/misc/texinfo.tex: Update from texinfo.
Diffstat (limited to 'lib/time.in.h')
| -rw-r--r-- | lib/time.in.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/time.in.h b/lib/time.in.h index 58dc5bf291b..81abdf46e0b 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -48,20 +48,13 @@ /* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3). Or they define it with the wrong member names or define it in <sys/time.h> - (e.g., FreeBSD circa 1997). Stock Mingw does not define it, but the - pthreads-win32 library defines it in <pthread.h>. */ + (e.g., FreeBSD circa 1997). Stock Mingw prior to 3.0 does not define it, + but the pthreads-win32 library defines it in <pthread.h>. */ # if ! @TIME_H_DEFINES_STRUCT_TIMESPEC@ # if @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ # include <sys/time.h> # elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ # include <pthread.h> -/* The pthreads-win32 <pthread.h> also defines a couple of broken macros. */ -# undef asctime_r -# undef ctime_r -# undef gmtime_r -# undef localtime_r -# undef rand_r -# undef strtok_r # else # ifdef __cplusplus |