mktime: #undef mktime before #defining it
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Jan 2011 07:04:27 +0000 (23:04 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Jan 2011 07:05:57 +0000 (23:05 -0800)
* lib/mktime.c (mktime) [DEBUG]: #undef mktime before #defining it.

ChangeLog
lib/mktime.c

index 252c1c46e7a41c771515a74c9d701fb53baed84d..f6454e83418a7aa1ce0652858576e22059235a3c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-01-29  Paul Eggert  <eggert@cs.ucla.edu>
 
+       mktime: #undef mktime before #defining it
+       * lib/mktime.c (mktime) [DEBUG]: #undef mktime before #defining it.
+
        mktime: systematically normalize tm_isdst comparisons
        * lib/mktime.c (isdst_differ): New function.
        (__mktime_internal): Use it systematically for all isdst comparisons.
index ef49814d649a91bf15435b64d8d13d70dc4b8ce2..d35bdd0441b85e8a24e82cd0928623a0a9fba662 100644 (file)
@@ -60,6 +60,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 */