This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 03/17] mktime: merge DEBUG change from gnulib
- From: Paul Eggert <eggert at cs dot ucla dot edu>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Fri, 16 Mar 2012 03:32:07 -0700
- Subject: [PATCH 03/17] mktime: merge DEBUG change from gnulib
* time/mktime.c (mktime) [DEBUG]: #undef before #define-ing, in
case system <time.h> has a #define.
---
ChangeLog | 4 ++++
time/mktime.c | 1 +
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8403770..1dc5c1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2012-03-16 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
--- 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 */
--
1.7.6.5