mktime: merge DEBUG change from gnulib

diff --git a/ChangeLog b/ChangeLog
index d33c22359aff302743a7711c63a18ffc11a033f3..a148b39fa5e1e14a7e34f3955cecafc758f21135 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 e4b3b66bc8b0df4046fcd94922363d59ea280724..d0b7738dec5828eb1e6c8e8b5b02cf6b5bbd05c7 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 */