On Fri, Jun 27, 2014 at 01:54:53AM -0700, Paul Eggert wrote: > Siddhesh Poyarekar wrote: > >-#if DEBUG > >+#ifdef DEBUG > > I'd rather not have this minor issue cause divergence between glibc and > gnulib, so I suggest that you change it to "#if defined DEBUG && DEBUG", > which should work under both regimes.
OK, modified patch according to your suggestion.
Siddhesh
* lib/mktime.c: Check if DEBUG is defined and non-zero.
diff --git a/lib/mktime.c b/lib/mktime.c
index f10e530..a52933e 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)
pgp6ygp0SPhWT.pgp
Description: PGP signature
