From 743c00e3ce2983df26077ea9cf25b29e871f80b2 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 22 Oct 2004 22:17:48 +0000 Subject: [PATCH] [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. --- ChangeLog | 5 +++++ time/mktime.c | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9e1e5ec9d8..7dccbfc039 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-10-22 Paul Eggert + [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 1acad267ae..fc46a6a566 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