diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | time/mktime.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index a148b39fa5..1b957aa6ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-05-22 Paul Eggert <eggert@cs.ucla.edu> + mktime: merge time_r change from gnulib + * time/mktime.c [!_LIBC]: Do not include "time_r.h". + mktime: merge DEBUG change from gnulib * time/mktime.c (mktime) [DEBUG]: #undef before #define-ing, in case system <time.h> has a #define. diff --git a/time/mktime.c b/time/mktime.c index d0b7738dec..15659d3d22 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -141,11 +141,10 @@ const unsigned short int __mon_yday[2][13] = #ifndef _LIBC -/* Portable standalone applications should supply a "time_r.h" that +/* Portable standalone applications should supply a <time.h> that declares a POSIX-compliant localtime_r, for the benefit of older implementations that lack localtime_r or have a nonstandard one. See the gnulib time_r module for one way to implement this. */ -# include "time_r.h" # undef __localtime_r # define __localtime_r localtime_r # define __mktime_internal mktime_internal |