projects
/
platform
/
upstream
/
glibc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0e44a77
)
mktime: merge HAVE_CONFIG_H change from gnulib
author
Paul Eggert
<eggert@cs.ucla.edu>
Tue, 22 May 2012 13:05:37 +0000
(06:05 -0700)
committer
H.J. Lu
<hjl.tools@gmail.com>
Tue, 22 May 2012 13:05:37 +0000
(06:05 -0700)
ChangeLog
patch
|
blob
|
history
time/mktime.c
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index
200c726
..
ad865fd
100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,3
+1,8
@@
+2012-05-22 Paul Eggert <eggert@cs.ucla.edu>
+
+ mktime: merge HAVE_CONFIG_H change from gnulib
+ * time/mktime.c: Include <config.h> if !_LIBC, not if HAVE_CONFIG_H.
+
2012-05-22 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/unix/sysv/linux/x86_64/sysdep.h (SYSCALL_SET_ERRNO):
diff --git
a/time/mktime.c
b/time/mktime.c
index
683d468
..
0e5fde0
100644
(file)
--- a/
time/mktime.c
+++ b/
time/mktime.c
@@
-21,7
+21,7
@@
mktime. */
/* #define DEBUG 1 */
-#if
def HAVE_CONFIG_H
+#if
ndef _LIBC
# include <config.h>
#endif