diff options
| author | Paul Eggert | 2014-07-12 13:02:44 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-07-12 13:02:44 -0700 |
| commit | d105c56ff95893f00e37a20bfd09f155fb87a5b4 (patch) | |
| tree | bcaded9914203580bf501b340230718f6998932e /lib | |
| parent | b39c4d7b33952e0125fbefbcb3d9f528b6570f40 (diff) | |
| download | emacs-d105c56ff95893f00e37a20bfd09f155fb87a5b4.tar.gz emacs-d105c56ff95893f00e37a20bfd09f155fb87a5b4.zip | |
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 @@ | |||
| 38 | 38 | ||
| 39 | #include <string.h> /* For the real memcpy prototype. */ | 39 | #include <string.h> /* For the real memcpy prototype. */ |
| 40 | 40 | ||
| 41 | #if DEBUG | 41 | #if defined DEBUG && DEBUG |
| 42 | # include <stdio.h> | 42 | # include <stdio.h> |
| 43 | # include <stdlib.h> | 43 | # include <stdlib.h> |
| 44 | /* Make it work even if the system's libc has its own mktime routine. */ | 44 | /* Make it work even if the system's libc has its own mktime routine. */ |
| @@ -600,7 +600,7 @@ libc_hidden_def (mktime) | |||
| 600 | libc_hidden_weak (timelocal) | 600 | libc_hidden_weak (timelocal) |
| 601 | #endif | 601 | #endif |
| 602 | 602 | ||
| 603 | #if DEBUG | 603 | #if defined DEBUG && DEBUG |
| 604 | 604 | ||
| 605 | static int | 605 | static int |
| 606 | not_equal_tm (const struct tm *a, const struct tm *b) | 606 | not_equal_tm (const struct tm *a, const struct tm *b) |