From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 30 Jan 2011 07:04:27 +0000 (-0800)
Subject: mktime: #undef mktime before #defining it
X-Git-Tag: v0.1~3272
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=56887e878833f53c8ca55371c0e4be66388e157b;p=gnulib.git

mktime: #undef mktime before #defining it

* lib/mktime.c (mktime) [DEBUG]: #undef mktime before #defining it.
---

diff --git a/ChangeLog b/ChangeLog
index 252c1c46e..f6454e834 100644
--- 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.
diff --git a/lib/mktime.c b/lib/mktime.c
index ef49814d6..d35bdd044 100644
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -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 */