From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 28 Jun 2014 00:45:54 +0000 (+0530)
Subject: Sync up mktime with gnulib
X-Git-Tag: glibc-2.20~198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd0ba018122e88937a5f14b6594b9a40693b2e58;p=thirdparty%2Fglibc.git

Sync up mktime with gnulib

From the gnulib commit log:

commit e2646b0c6b5acda25e9ffeb4c12a5513a1e3b5ac
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Fri Jun 27 11:35:44 2014 -0700

    mktime: merge #if/#ifdef usage from glibc

    * lib/mktime.c: Use "#if defined DEBUG && DEBUG", not "#if DEBUG",
    as that works with both Glibc's and Gnulib's style.
    See thread starting at Siddhesh Poyarekar's bug report at:
    http://lists.gnu.org/archive/html/bug-gnulib/2014-06/msg00102.html
---

diff --git a/ChangeLog b/ChangeLog
index 0f8b5382d93..33ce8eded70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-06-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	mktime: merge #if/#ifdef usage from glibc
+	* lib/mktime.c: Use "#if defined DEBUG && DEBUG", not "#if DEBUG",
+	as that works with both Glibc's and Gnulib's style.
+	See thread starting at Siddhesh Poyarekar's bug report at:
+	http://lists.gnu.org/archive/html/bug-gnulib/2014-06/msg00102.html
+
 2014-06-28  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	* sysdeps/generic/memcopy.h: Define MEMCPY_OK_FOR_FWD_MEMMOVE.
diff --git a/time/mktime.c b/time/mktime.c
index f10e5301de1..a52933e0e93 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -38,7 +38,7 @@
 
 #include <string.h>		/* For the real memcpy prototype.  */
 
-#if DEBUG
+#if defined DEBUG && DEBUG
 # include <stdio.h>
 # include <stdlib.h>
 /* Make it work even if the system's libc has its own mktime routine.  */
@@ -600,7 +600,7 @@ libc_hidden_def (mktime)
 libc_hidden_weak (timelocal)
 #endif
 
-#if DEBUG
+#if defined DEBUG && DEBUG
 
 static int
 not_equal_tm (const struct tm *a, const struct tm *b)