summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-05-22 06:09:01 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-05-22 06:09:01 -0700
commit826dd0abdfe2b8ba1c4b4effb4c61ed4b405ff12 (patch)
tree5bdc4376e60a1377569c966dce4c5fa44957aeb7 /ChangeLog
parentbd83aabe5a14f6e741c80b61f8d0d981baeb2e70 (diff)
downloadglibc-826dd0abdfe2b8ba1c4b4effb4c61ed4b405ff12.tar.gz
glibc-826dd0abdfe2b8ba1c4b4effb4c61ed4b405ff12.tar.xz
glibc-826dd0abdfe2b8ba1c4b4effb4c61ed4b405ff12.zip
mktime: merge DEBUG change from gnulib
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d33c22359a..a148b39fa5 100644
--- 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.