OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mktime: merge time_r change from gnulib

This commit is contained in:
Paul Eggert 2012-05-22 06:10:34 -07:00 committed by H.J. Lu
parent 826dd0abdf
commit 2554247d83
2 changed files with 4 additions and 2 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>
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.

3
time/mktime.c
View File

@ -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