diff --git a/src/tzfile.h b/src/tzfile.h index b00eb9e6..1941bc3b 100644 --- a/src/tzfile.h +++ b/src/tzfile.h @@ -17,16 +17,8 @@ ** Thank you! */ -/* -** Information about time zone files. -*/ - -#ifndef TZDEFRULES -# define TZDEFRULES "posixrules" -#endif /* !defined TZDEFRULES */ - - -/* See Internet RFC 9636 for more details about the following format. */ +/* Information about time zone files. + See Internet RFC 9636 for more details about the following format. */ /* ** Each file begins with. . . @@ -97,23 +89,25 @@ struct tzhead { */ #ifndef TZ_MAX_TIMES -/* This must be at least 242 for Europe/London with 'zic -b fat'. */ +/* The following limit applies to localtime.c; zic has no such limit. + The limit must be at least 310 for Asia/Hebron with 'zic -b fat'. */ # define TZ_MAX_TIMES 2000 #endif /* !defined TZ_MAX_TIMES */ #ifndef TZ_MAX_TYPES /* This must be at least 18 for Europe/Vilnius with 'zic -b fat'. */ -# define TZ_MAX_TYPES 256 /* Limited by what (unsigned char)'s can hold */ +# define TZ_MAX_TYPES 256 /* Limited to 256 by Internet RFC 9636. */ #endif /* !defined TZ_MAX_TYPES */ #ifndef TZ_MAX_CHARS /* This must be at least 40 for America/Anchorage. */ -# define TZ_MAX_CHARS 50 /* Maximum number of abbreviation characters */ - /* (limited by what unsigned chars can hold) */ +# define TZ_MAX_CHARS 256 /* Maximum number of abbreviation characters */ + /* (limited to 256 by Internet RFC 9636) */ #endif /* !defined TZ_MAX_CHARS */ #ifndef TZ_MAX_LEAPS -/* This must be at least 27 for leap seconds from 1972 through mid-2023. +/* The following limit applies to localtime.c; zic has no such limit. + The limit must be at least 27 for leap seconds from 1972 through mid-2023. There's a plan to discontinue leap seconds by 2035. */ # define TZ_MAX_LEAPS 50 /* Maximum number of leap second corrections */ #endif /* !defined TZ_MAX_LEAPS */ diff --git a/testdata/version b/testdata/version index cb3be9ab..5d912600 100644 --- a/testdata/version +++ b/testdata/version @@ -1 +1 @@ -2025c +2026a diff --git a/testdata/zoneinfo/Asia/Tbilisi b/testdata/zoneinfo/Asia/Tbilisi index 166e4341..247caa63 100644 Binary files a/testdata/zoneinfo/Asia/Tbilisi and b/testdata/zoneinfo/Asia/Tbilisi differ diff --git a/testdata/zoneinfo/Europe/Chisinau b/testdata/zoneinfo/Europe/Chisinau index 9152e685..a60bddd7 100644 Binary files a/testdata/zoneinfo/Europe/Chisinau and b/testdata/zoneinfo/Europe/Chisinau differ diff --git a/testdata/zoneinfo/Europe/Tiraspol b/testdata/zoneinfo/Europe/Tiraspol index 9152e685..a60bddd7 100644 Binary files a/testdata/zoneinfo/Europe/Tiraspol and b/testdata/zoneinfo/Europe/Tiraspol differ diff --git a/testdata/zoneinfo/zonenow.tab b/testdata/zoneinfo/zonenow.tab index 1d64b391..aa3a64f3 100644 --- a/testdata/zoneinfo/zonenow.tab +++ b/testdata/zoneinfo/zonenow.tab @@ -166,9 +166,6 @@ XX +3003+03115 Africa/Cairo Egypt # +02/+03 - EET/EEST (Lebanon DST) XX +3353+03530 Asia/Beirut Lebanon # -# +02/+03 - EET/EEST (Moldova DST) -XX +4700+02850 Europe/Chisinau Moldova -# # +02/+03 - EET/EEST (Palestine DST) XX +3130+03428 Asia/Gaza Palestine #