From: Bruno Haible Date: Sat, 15 Aug 2020 15:54:45 +0000 (+0200) Subject: Revert autoupdate's revert. X-Git-Tag: v1.0~3759 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=da1fa225cd95d1ae8c6e1d6070e60e4c074da66a;p=gnulib.git Revert autoupdate's revert. * config/srclist.txt: Mark mktime.c as needing sync with glibc. --- diff --git a/ChangeLog b/ChangeLog index 65bdf1cde0..28229a66c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2020-08-15 Bruno Haible + + Revert autoupdate's revert. + * config/srclist.txt: Mark mktime.c as needing sync with glibc. + 2020-08-15 Bruno Haible frexpl: Fix configuration test result on MSVC. diff --git a/config/srclist.txt b/config/srclist.txt index d8fbebff55..b82d2815ee 100644 --- a/config/srclist.txt +++ b/config/srclist.txt @@ -61,7 +61,7 @@ $LIBCSRC posix/regex_internal.c lib #$LIBCSRC posix/regex_internal.h lib $LIBCSRC posix/regexec.c lib $LIBCSRC time/timegm.c lib -$LIBCSRC time/mktime.c lib +#$LIBCSRC time/mktime.c lib $LIBCSRC time/mktime-internal.h lib # diff --git a/lib/mktime.c b/lib/mktime.c index c8735164f6..600148795b 100644 --- a/lib/mktime.c +++ b/lib/mktime.c @@ -94,7 +94,7 @@ my_tzset (void) const char *tz = getenv ("TZ"); if (tz != NULL && strchr (tz, '/') != NULL) _putenv ("TZ="); -# elif HAVE_TZSET +# else tzset (); # endif }