Mercurial > hg > octave-nkf > gnulib-hg
changeset 17712:61ee95f97ee1
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
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Fri, 27 Jun 2014 11:35:44 -0700 |
| parents | bbf6398214e1 |
| children | 1f14c6dd175d |
| files | ChangeLog lib/mktime.c |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-06-27 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-20 Alfred M. Szmidt <ams@gnu.org> git-version-gen: improve option descriptions
--- 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_weak (timelocal) #endif -#if DEBUG +#if defined DEBUG && DEBUG static int not_equal_tm (const struct tm *a, const struct tm *b)