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:
bd83aab
)
mktime: merge DEBUG change from gnulib
author
Paul Eggert
<eggert@cs.ucla.edu>
Tue, 22 May 2012 13:09:01 +0000
(06:09 -0700)
committer
H.J. Lu
<hjl.tools@gmail.com>
Tue, 22 May 2012 13:09:01 +0000
(06:09 -0700)
ChangeLog
patch
|
blob
|
history
time/mktime.c
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index
d33c223
..
a148b39
100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,5
+1,9
@@
2012-05-22 Paul Eggert <eggert@cs.ucla.edu>
+ mktime: merge DEBUG change from gnulib
+ * time/mktime.c (mktime) [DEBUG]: #undef before #define-ing, in
+ case system <time.h> has a #define.
+
mktime: merge <sys/types.h> change from gnulib
* time/mktime.c: Do not include <sys/types.h>; no longer needed,
since <time.t> is now guaranteed to define time_t.
diff --git
a/time/mktime.c
b/time/mktime.c
index
e4b3b66
..
d0b7738
100644
(file)
--- a/
time/mktime.c
+++ b/
time/mktime.c
@@
-42,6
+42,7
@@
# include <stdio.h>
# include <stdlib.h>
/* Make it work even if the system's libc has its own mktime routine. */
+# undef mktime
# define mktime my_mktime
#endif /* DEBUG */