diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-06-28 06:15:54 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-06-28 06:15:54 +0530 |
| commit | dd0ba018122e88937a5f14b6594b9a40693b2e58 (patch) | |
| tree | 3dd76b6f283c521778c04ac45c23c070cfeebccd | |
| parent | 64df73c2ea0e02f7794ba2f08540a74a9bb198db (diff) | |
| download | glibc-dd0ba018122e88937a5f14b6594b9a40693b2e58.tar.gz glibc-dd0ba018122e88937a5f14b6594b9a40693b2e58.tar.xz glibc-dd0ba018122e88937a5f14b6594b9a40693b2e58.zip | |
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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | time/mktime.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 0f8b5382d9..33ce8eded7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-06-28 Paul Eggert <eggert@cs.ucla.edu> + + 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-28 Siddhesh Poyarekar <siddhesh@redhat.com> * sysdeps/generic/memcopy.h: Define MEMCPY_OK_FOR_FWD_MEMMOVE. diff --git a/time/mktime.c b/time/mktime.c index f10e5301de..a52933e0e9 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) |