* lib/mktime.c [DEBUG_MKTIME]: Do not include <config.h>.
Include <string.h>, for strcmp.
---
 ChangeLog    | 4 ++++
 lib/mktime.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5b0dc93..0473a32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2016-05-01  Paul Eggert  <egg...@cs.ucla.edu>
 
+       mktime: resurrect DEBUG_MKTIME testing
+       * lib/mktime.c [DEBUG_MKTIME]: Do not include <config.h>.
+       Include <string.h>, for strcmp.
+
        mktime: simplify DEBUG_MKTIME
        * lib/mktime.c (DEBUG_MKTIME): Define to 0 if not defined.
        Simplify later usage accordingly.
diff --git a/lib/mktime.c b/lib/mktime.c
index ccc6c51..032ea39 100644
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -23,7 +23,7 @@
 # define DEBUG_MKTIME 0
 #endif
 
-#ifndef _LIBC
+#if !defined _LIBC && !DEBUG_MKTIME
 # include <config.h>
 #endif
 
@@ -45,6 +45,7 @@
 #if DEBUG_MKTIME
 # include <stdio.h>
 # include <stdlib.h>
+# include <string.h>
 /* Make it work even if the system's libc has its own mktime routine.  */
 # undef mktime
 # define mktime my_mktime
-- 
2.5.5


Reply via email to