From: Paul Eggert Date: Fri, 27 Jun 2014 18:35:44 +0000 (-0700) Subject: mktime: merge #if/#ifdef usage from glibc X-Git-Tag: v1.0~7346 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=e2646b0c6b5acda25e9ffeb4c12a5513a1e3b5ac;p=gnulib.git 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 c950bdf152..e7938665df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-06-27 Paul Eggert + + 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-20 Alfred M. Szmidt git-version-gen: improve option descriptions diff --git a/lib/mktime.c b/lib/mktime.c index f10e5301de..a52933e0e9 100644 --- a/lib/mktime.c +++ b/lib/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)