diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-05-22 06:11:29 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-05-22 06:11:29 -0700 |
| commit | 643e01e6cbbcb37daa53e8020f099c9822615026 (patch) | |
| tree | aa7ce9c890e21b941872e372ac7f64b26fe5130d | |
| parent | 2554247d83080250693a60f9aca91820af4234e0 (diff) | |
| download | glibc-643e01e6cbbcb37daa53e8020f099c9822615026.zip glibc-643e01e6cbbcb37daa53e8020f099c9822615026.tar.gz glibc-643e01e6cbbcb37daa53e8020f099c9822615026.tar.bz2 | |
mktime: merge mktime-internal.h change from gnulib
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | time/mktime.c | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -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 15659d3..5a4f742 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) - |