diff options
| author | Simon Josefsson <simon@josefsson.org> | 2010-10-14 15:52:47 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2010-10-14 15:52:47 +0200 |
| commit | dbe767085787f5fdec183749a86c279a28676cc8 (patch) | |
| tree | f618faa5de5488463a8715a410915cb0ddfec04a /lib/gl/time.in.h | |
| parent | 9b3338ea218a58adb2f573f023718be1f0372da4 (diff) | |
| download | gnutls-dbe767085787f5fdec183749a86c279a28676cc8.tar.gz | |
Update gnulib files.
Diffstat (limited to 'lib/gl/time.in.h')
| -rw-r--r-- | lib/gl/time.in.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/gl/time.in.h b/lib/gl/time.in.h index 7e86161299..8b93a3ee1d 100644 --- a/lib/gl/time.in.h +++ b/lib/gl/time.in.h @@ -19,6 +19,7 @@ #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif +@PRAGMA_COLUMNS@ /* Don't get in the way of glibc when it includes time.h merely to declare a few standard symbols, rather than to declare all the @@ -48,10 +49,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 |