From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 12 Jul 2014 20:02:44 +0000 (-0700)
Subject: Merge from gnulib, incorporating:
X-Git-Tag: emacs-25.0.90~2612^2~709^2~646
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d105c56ff95893f00e37a20bfd09f155fb87a5b4;p=emacs.git

Merge from gnulib, incorporating:

2014-06-27 mktime: merge #if/#ifdef usage from glibc
* lib/mktime.c: Update from gnulib.
---

diff --git a/ChangeLog b/ChangeLog
index 5e6822737f1..f8852211e9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-07-12  Paul Eggert  <eggert@cs.ucla.edu>
 
+	Merge from gnulib, incorporating:
+	2014-06-27 mktime: merge #if/#ifdef usage from glibc
+	* lib/mktime.c: Update from gnulib.
+
 	* Makefile.in (install-arch-indep): Avoid readdir race (Bug#17971).
 
 2014-07-10  Dmitry Antipov  <dmantipov@yandex.ru>
diff --git a/lib/mktime.c b/lib/mktime.c
index 29438237760..48b3a40f9c7 100644
--- a/lib/mktime.c
+++ b/lib/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)