summaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorMartin Sebor <msebor@redhat.com>2016-01-15 11:07:41 -0700
committerMartin Sebor <msebor@redhat.com>2016-01-15 11:07:41 -0700
commitf2b3078e6a20211233d4971653838e06d048296a (patch)
treec8f87652683c3788442b44a25e83bf82d22857c8 /time
parentad37480c4b79b801b987f5529d036b4e25cac615 (diff)
downloadglibc-f2b3078e6a20211233d4971653838e06d048296a.tar.gz
Fix build failures with -DDEBUG.
[BZ #19443] * crypt/crypt_util.c [DEBUG] (_ufc_prbits): Correct format string. [DEBUG] (_ufc_set_bits): Declare used. * iconv/gconv_dl.c [DEBUG]: Add a missing include directive. [DEBUG] (print_all): Declare used. * resolv/res_send.c [DEBUG] (__libc_res_nsend): Explicitly convert operands of the ternary ?: expression to target type. * stdlib/rshift.c [DEBUG] (mpn_rshift): Use assert() instead of calling the undeclared abort. * time/mktime.c [DEBUG] (DEBUG): Rename to DEBUG_MKTIME.
Diffstat (limited to 'time')
-rw-r--r--time/mktime.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/time/mktime.c b/time/mktime.c
index 7d06314d87..bc7ed5674b 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -19,7 +19,7 @@
/* Define this to have a standalone program to test this implementation of
mktime. */
-/* #define DEBUG 1 */
+/* #define DEBUG_MKTIME 1 */
#ifndef _LIBC
# include <config.h>
@@ -38,13 +38,13 @@
#include <string.h> /* For the real memcpy prototype. */
-#if defined DEBUG && DEBUG
+#if defined DEBUG_MKTIME && DEBUG_MKTIME
# include <stdio.h>
# include <stdlib.h>
/* Make it work even if the system's libc has its own mktime routine. */
# undef mktime
# define mktime my_mktime
-#endif /* DEBUG */
+#endif /* DEBUG_MKTIME */
/* Some of the code in this file assumes that signed integer overflow
silently wraps around. This assumption can't easily be programmed
@@ -600,7 +600,7 @@ libc_hidden_def (mktime)
libc_hidden_weak (timelocal)
#endif
-#if defined DEBUG && DEBUG
+#if defined DEBUG_MKTIME && DEBUG_MKTIME
static int
not_equal_tm (const struct tm *a, const struct tm *b)
@@ -732,10 +732,10 @@ main (int argc, char **argv)
return status;
}
-#endif /* DEBUG */
+#endif /* DEBUG_MKTIME */
/*
Local Variables:
-compile-command: "gcc -DDEBUG -I. -Wall -W -O2 -g mktime.c -o mktime"
+compile-command: "gcc -DDEBUG_MKTIME -I. -Wall -W -O2 -g mktime.c -o mktime"
End:
*/