aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-10-22 22:21:36 +0000
committerRoland McGrath <roland@gnu.org>2004-10-22 22:21:36 +0000
commit347a6c2dd8ca5208c16c9d3f32160defe7a7eda1 (patch)
tree26703d225dc316470e5688a0ed694c82c44172f2
parent743c00e3ce2983df26077ea9cf25b29e871f80b2 (diff)
downloadglibc-347a6c2dd8ca5208c16c9d3f32160defe7a7eda1.zip
glibc-347a6c2dd8ca5208c16c9d3f32160defe7a7eda1.tar.gz
glibc-347a6c2dd8ca5208c16c9d3f32160defe7a7eda1.tar.bz2
[BZ #468] Import a fix from gnulib.
* time/mktime.c [! DEBUG]: Do not include <string.h>. It's needed only if DEBUG is nonzero.
-rw-r--r--ChangeLog4
-rw-r--r--time/mktime.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7dccbfc..998a28b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2004-10-22 Paul Eggert <eggert@cs.ucla.edu>
+ [BZ #468] Import a fix from gnulib.
+ * time/mktime.c [! DEBUG]: Do not include <string.h>.
+ It's needed only if DEBUG is nonzero.
+
[BZ #470] Import fix from gnulib.
* time/mktime.c [!_LIBC] (__mktime_internal): Define to
mktime_internal, to avoid clashes with any __mktime_internal
diff --git a/time/mktime.c b/time/mktime.c
index fc46a6a..8f1f51e 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -37,11 +37,11 @@
#include <time.h>
#include <limits.h>
-#include <string.h> /* For string function builtin redirect. */
#if DEBUG
# include <stdio.h>
# include <stdlib.h>
+# include <string.h>
/* Make it work even if the system's libc has its own mktime routine. */
# define mktime my_mktime
#endif /* DEBUG */