[BZ #468] Import a fix from gnulib.

	* time/mktime.c [! DEBUG]: Do not include <string.h>.
	It's needed only if DEBUG is nonzero.

diff --git a/ChangeLog b/ChangeLog
index 7dccbfc039310971ee85c48fa89a9810c11eb908..998a28b9563e8a98be4cdf997b211fc56c09ae0d 100644 (file)
--- 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 fc46a6a5660c9dfb18b4178c49f578f52853935f..8f1f51e10d13e1fb800d11ef69bb689efcc2c1ac 100644 (file)
--- 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 */