aboutsummaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2014-06-28 06:15:54 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2014-06-28 06:15:54 +0530
commitdd0ba018122e88937a5f14b6594b9a40693b2e58 (patch)
tree3dd76b6f283c521778c04ac45c23c070cfeebccd /time
parent64df73c2ea0e02f7794ba2f08540a74a9bb198db (diff)
downloadglibc-dd0ba018122e88937a5f14b6594b9a40693b2e58.zip
glibc-dd0ba018122e88937a5f14b6594b9a40693b2e58.tar.gz
glibc-dd0ba018122e88937a5f14b6594b9a40693b2e58.tar.bz2
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
Diffstat (limited to 'time')
-rw-r--r--time/mktime.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/time/mktime.c b/time/mktime.c
index f10e530..a52933e 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)