system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

mktime: merge mktime-internal.h change from gnulib

Browse Source
This commit is contained in:
Paul Eggert 2012-05-22 06:11:29 -07:00 committed by H.J. Lu
parent 2554247d83
commit 643e01e6cb
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2012-05-22 Paul Eggert <eggert@cs.ucla.edu> 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 mktime: merge time_r change from gnulib
* time/mktime.c [!_LIBC]: Do not include "time_r.h". * time/mktime.c [!_LIBC]: Do not include "time_r.h".

1
time/mktime.c
View File

@ -148,6 +148,7 @@ const unsigned short int __mon_yday[2][13] =
# undef __localtime_r # undef __localtime_r
# define __localtime_r localtime_r # define __localtime_r localtime_r
# define __mktime_internal mktime_internal # define __mktime_internal mktime_internal
# include "mktime-internal.h"
#endif #endif
/* Return an integer value measuring (YEAR1-YDAY1 HOUR1:MIN1:SEC1) - /* Return an integer value measuring (YEAR1-YDAY1 HOUR1:MIN1:SEC1) -