diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-07-12 13:02:44 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-07-12 13:02:44 -0700 |
| commit | d105c56ff95893f00e37a20bfd09f155fb87a5b4 (patch) | |
| tree | bcaded9914203580bf501b340230718f6998932e /lib | |
| parent | b39c4d7b33952e0125fbefbcb3d9f528b6570f40 (diff) | |
| download | emacs-d105c56ff95893f00e37a20bfd09f155fb87a5b4.tar.gz | |
Merge from gnulib, incorporating:
2014-06-27 mktime: merge #if/#ifdef usage from glibc
* lib/mktime.c: Update from gnulib.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mktime.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mktime.c b/lib/mktime.c index 29438237760..48b3a40f9c7 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) |