diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | time/mktime.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 1b957aa6ae..7cd5cb0df8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-05-22 Paul Eggert <eggert@cs.ucla.edu> + mktime: merge mktime-internal.h change from gnulib + * time/mktime.c [!_LIBC]: Include "mktime-internal.h". + mktime: merge time_r change from gnulib * time/mktime.c [!_LIBC]: Do not include "time_r.h". diff --git a/time/mktime.c b/time/mktime.c index 15659d3d22..5a4f74203d 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -148,6 +148,7 @@ const unsigned short int __mon_yday[2][13] = # undef __localtime_r # define __localtime_r localtime_r # define __mktime_internal mktime_internal +# include "mktime-internal.h" #endif /* Return an integer value measuring (YEAR1-YDAY1 HOUR1:MIN1:SEC1) - |