From: Roland McGrath <roland@gnu.org>
Date: Fri, 22 Oct 2004 22:21:36 +0000 (+0000)
Subject: [BZ #468] Import a fix from gnulib.
X-Git-Tag: cvs/fedora-glibc-20041102T1153~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=347a6c2dd8ca5208c16c9d3f32160defe7a7eda1;p=thirdparty%2Fglibc.git

[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 7dccbfc0393..998a28b9563 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 fc46a6a5660..8f1f51e10d1 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 */