about summary refs log tree commit diff
path: root/time
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 /time
parentbd83aabe5a14f6e741c80b61f8d0d981baeb2e70 (diff)
downloadglibc-826dd0abdfe2b8ba1c4b4effb4c61ed4b405ff12.tar.gz
glibc-826dd0abdfe2b8ba1c4b4effb4c61ed4b405ff12.tar.xz
glibc-826dd0abdfe2b8ba1c4b4effb4c61ed4b405ff12.zip
mktime: merge DEBUG change from gnulib
Diffstat (limited to 'time')
-rw-r--r--time/mktime.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/time/mktime.c b/time/mktime.c
index e4b3b66bc8..d0b7738dec 100644
--- 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 */