From dd0ba018122e88937a5f14b6594b9a40693b2e58 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 28 Jun 2014 06:15:54 +0530 Subject: Sync up mktime with gnulib From the gnulib commit log: commit e2646b0c6b5acda25e9ffeb4c12a5513a1e3b5ac Author: Paul Eggert 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 --- time/mktime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'time') diff --git a/time/mktime.c b/time/mktime.c index f10e5301de..a52933e0e9 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -38,7 +38,7 @@ #include /* For the real memcpy prototype. */ -#if DEBUG +#if defined DEBUG && DEBUG # include # include /* 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) -- cgit v1.2.1