bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] mktime: rename macro to avoid glibc clash


From: Paul Eggert
Subject: [PATCH] mktime: rename macro to avoid glibc clash
Date: Tue, 12 Jan 2016 23:10:51 -0800

From: Martin Sebor <address@hidden>

* lib/mktime.c [DEBUG] (DEBUG): Rename to DEBUG_MKTIME.  See:
https://sourceware.org/ml/libc-alpha/2016-01/msg00267.html
---
 ChangeLog    |  6 ++++++
 lib/mktime.c | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c93e8a9..1434b3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-12  Martin Sebor  <address@hidden>
+
+       mktime: rename macro to avoid glibc clash
+       * lib/mktime.c [DEBUG] (DEBUG): Rename to DEBUG_MKTIME.  See:
+       https://sourceware.org/ml/libc-alpha/2016-01/msg00267.html
+
 2016-01-12  Paul Eggert  <address@hidden>
 
        Port "$@" to OpenIndiana ksh93
diff --git a/lib/mktime.c b/lib/mktime.c
index 7d06314..bc7ed56 100644
--- a/lib/mktime.c
+++ b/lib/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:
 */
-- 
2.5.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]