From 61d64408a1f42b0340d37ea0c90a9f028ffb1bfd Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 15 May 2020 08:52:25 -0700 Subject: Update timezone code from tzcode 2020a This patch updates files coming from tzcode to tzcode 2020a. This is mostly for better support for Internet RFC 8536, by adding support to zic for the Expires line (new to tzcode 2020a), the -b option (new to 2019b) and the -r option (new to 2019a). One trivial change to other glibc was needed. * time/tzfile.c (__tzfile_read): Adjust to tzcode private.h renaming. * timezone/private.h, timezone/tzfile.h, timezone/version: * timezone/zdump.c, timezone/zic.c: Update from tzcode 2020a. --- time/tzfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'time') diff --git a/time/tzfile.c b/time/tzfile.c index 013b3d03f3..af6da1bf00 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -189,7 +189,7 @@ __tzfile_read (const char *file, size_t extra, char **extrap) chars = (size_t) decode (tzhead.tzh_charcnt); num_leaps = (size_t) decode (tzhead.tzh_leapcnt); num_isstd = (size_t) decode (tzhead.tzh_ttisstdcnt); - num_isgmt = (size_t) decode (tzhead.tzh_ttisgmtcnt); + num_isgmt = (size_t) decode (tzhead.tzh_ttisutcnt); if (__glibc_unlikely (num_isstd > num_types || num_isgmt > num_types)) goto lose; -- cgit 1.4.1