summaryrefslogtreecommitdiff
path: root/lib/time.in.h
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2010-06-05 16:18:01 +0200
committerLudovic Courtès <ludo@gnu.org>2010-06-05 16:18:01 +0200
commit6f32e5c739be136e90b76a79281b406c9486deff (patch)
treed7ae8d060ee53fb7f03f4d60c60839a07cae33f8 /lib/time.in.h
parent615eb45521a6810ca2bc89763d5b4892a88ae313 (diff)
downloadguile-6f32e5c739be136e90b76a79281b406c9486deff.tar.gz
Update Gnulib to v0.0-3966-g9f737c8 for `libunistring' m4 fixes.
Diffstat (limited to 'lib/time.in.h')
-rw-r--r--lib/time.in.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/time.in.h b/lib/time.in.h
index eff1bf63d..83b337d6a 100644
--- a/lib/time.in.h
+++ b/lib/time.in.h
@@ -48,10 +48,20 @@
/* 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). */
+ (e.g., FreeBSD circa 1997). Stock Mingw 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