projects
/
external
/
glibc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2554247
)
mktime: merge mktime-internal.h change from gnulib
author
Paul Eggert
<eggert@cs.ucla.edu>
Tue, 22 May 2012 13:11:29 +0000
(06:11 -0700)
committer
H.J. Lu
<hjl.tools@gmail.com>
Tue, 22 May 2012 13:11:29 +0000
(06:11 -0700)
ChangeLog
patch
|
blob
|
history
time/mktime.c
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index
1b957aa
..
7cd5cb0
100644
(file)
--- 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
15659d3
..
5a4f742
100644
(file)
--- 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) -