From: Roland McGrath <roland@gnu.org>
Date: Fri, 22 Oct 2004 22:17:48 +0000 (+0000)
Subject: [BZ #470] Import fix from gnulib.
X-Git-Tag: upstream/2.30~17287
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=743c00e3ce2983df26077ea9cf25b29e871f80b2;p=external%2Fglibc.git

[BZ #470] Import fix from gnulib.

	* time/mktime.c [!_LIBC] (__mktime_internal): Define to
	mktime_internal, to avoid clashes with any __mktime_internal
	function defined in the standard library.
---

diff --git a/ChangeLog b/ChangeLog
index 9e1e5ec..7dccbfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-10-22  Paul Eggert  <eggert@cs.ucla.edu>
 
+	[BZ #470] Import fix from gnulib.
+	* time/mktime.c [!_LIBC] (__mktime_internal): Define to
+	mktime_internal, to avoid clashes with any __mktime_internal
+	function defined in the standard library.
+
 	[BZ #469] Imported from gnulib.
 	* time/mktime.c (__isleap): Remove; all uses replaced by:
 	(leapyear): New function, which avoids overflow by not adding
diff --git a/time/mktime.c b/time/mktime.c
index 1acad26..fc46a6a 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -108,6 +108,7 @@ const unsigned short int __mon_yday[2][13] =
 # include "time_r.h"
 # undef __localtime_r
 # define __localtime_r localtime_r
+# define __mktime_internal mktime_internal
 #endif