Mercurial > hg > octave-shane > gnulib-hg

changeset 14248:d10e6185929a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mktime: #undef mktime before #defining it * lib/mktime.c (mktime) [DEBUG]: #undef mktime before #defining it.
author Paul Eggert <eggert@cs.ucla.edu>
date Sat, 29 Jan 2011 23:04:27 -0800
parents 8d2265e4de51
children 52b55b447c02
files ChangeLog lib/mktime.c
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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 */