public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin/main] Cygwin: utils: refresh tzmap.h
@ 2024-03-21  9:34 Corinna Vinschen
  0 siblings, 0 replies; 2+ messages in thread
From: Corinna Vinschen @ 2024-03-21  9:34 UTC (permalink / raw)
  To: cygwin-cvs

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=8e12860944c2c1ee21f91f06502a96846db086b8

commit 8e12860944c2c1ee21f91f06502a96846db086b8
Author:     Corinna Vinschen <corinna@vinschen.de>
AuthorDate: Wed Mar 20 23:00:02 2024 +0100
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Wed Mar 20 23:00:02 2024 +0100

    Cygwin: utils: refresh tzmap.h
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/utils/tzmap.h | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/winsup/utils/tzmap.h b/winsup/utils/tzmap.h
index 9021181a5b94..c07a8ed1f175 100644
--- a/winsup/utils/tzmap.h
+++ b/winsup/utils/tzmap.h
@@ -28,8 +28,6 @@
     SA Pacific Standard Time/HT 
     South Africa Standard Time/LY
 
-  While these are apparently old, they are required here to get a complete
-  mapping on all supported OSes. */
 struct
 {
   PCWSTR win_tzkey;
@@ -103,12 +101,11 @@ struct
   { L"Central America Standard Time", L"NI", L"America/Managua" },
   { L"Central America Standard Time", L"SV", L"America/El_Salvador" },
   { L"Central America Standard Time", L"ZZ", L"Etc/GMT+6" },
-  { L"Central Asia Standard Time", L"", L"Asia/Almaty" },
+  { L"Central Asia Standard Time", L"", L"Asia/Bishkek" },
   { L"Central Asia Standard Time", L"AQ", L"Antarctica/Vostok" },
   { L"Central Asia Standard Time", L"CN", L"Asia/Urumqi" },
   { L"Central Asia Standard Time", L"IO", L"Indian/Chagos" },
   { L"Central Asia Standard Time", L"KG", L"Asia/Bishkek" },
-  { L"Central Asia Standard Time", L"KZ", L"Asia/Almaty Asia/Qostanay" },
   { L"Central Asia Standard Time", L"ZZ", L"Etc/GMT-6" },
   { L"Central Brazilian Standard Time", L"", L"America/Cuiaba" },
   { L"Central Brazilian Standard Time", L"BR", L"America/Cuiaba America/Campo_Grande" },
@@ -133,12 +130,12 @@ struct
   { L"Central Pacific Standard Time", L"VU", L"Pacific/Efate" },
   { L"Central Pacific Standard Time", L"ZZ", L"Etc/GMT-11" },
   { L"Central Standard Time", L"", L"America/Chicago" },
-  { L"Central Standard Time", L"CA", L"America/Winnipeg America/Rainy_River America/Rankin_Inlet America/Resolute" },
-  { L"Central Standard Time", L"MX", L"America/Matamoros" },
+  { L"Central Standard Time", L"CA", L"America/Winnipeg America/Rankin_Inlet America/Resolute" },
+  { L"Central Standard Time", L"MX", L"America/Matamoros America/Ojinaga" },
   { L"Central Standard Time", L"US", L"America/Chicago America/Indiana/Knox America/Indiana/Tell_City America/Menominee America/North_Dakota/Beulah America/North_Dakota/Center America/North_Dakota/New_Salem" },
   { L"Central Standard Time", L"ZZ", L"CST6CDT" },
   { L"Central Standard Time (Mexico)", L"", L"America/Mexico_City" },
-  { L"Central Standard Time (Mexico)", L"MX", L"America/Mexico_City America/Bahia_Banderas America/Merida America/Monterrey" },
+  { L"Central Standard Time (Mexico)", L"MX", L"America/Mexico_City America/Bahia_Banderas America/Merida America/Monterrey America/Chihuahua " },
   { L"Chatham Islands Standard Time", L"", L"Pacific/Chatham" },
   { L"Chatham Islands Standard Time", L"NZ", L"Pacific/Chatham" },
   { L"China Standard Time", L"", L"Asia/Shanghai" },
@@ -174,7 +171,7 @@ struct
   { L"Easter Island Standard Time", L"CL", L"Pacific/Easter" },
   { L"Eastern Standard Time", L"", L"America/New_York" },
   { L"Eastern Standard Time", L"BS", L"America/Nassau" },
-  { L"Eastern Standard Time", L"CA", L"America/Toronto America/Iqaluit America/Montreal America/Nipigon America/Pangnirtung America/Thunder_Bay" },
+  { L"Eastern Standard Time", L"CA", L"America/Toronto America/Iqaluit" },
   { L"Eastern Standard Time", L"TC", L"America/Grand_Turk" },
   { L"Eastern Standard Time", L"US", L"America/New_York America/Detroit America/Indiana/Petersburg America/Indiana/Vincennes America/Indiana/Winamac America/Kentucky/Monticello America/Louisville" },
   { L"Eastern Standard Time", L"ZZ", L"EST5EDT" },
@@ -192,7 +189,7 @@ struct
   { L"FLE Standard Time", L"FI", L"Europe/Helsinki" },
   { L"FLE Standard Time", L"LT", L"Europe/Vilnius" },
   { L"FLE Standard Time", L"LV", L"Europe/Riga" },
-  { L"FLE Standard Time", L"UA", L"Europe/Kiev Europe/Uzhgorod Europe/Zaporozhye" },
+  { L"FLE Standard Time", L"UA", L"Europe/Kiev" },
   { L"Fiji Standard Time", L"", L"Pacific/Fiji" },
   { L"Fiji Standard Time", L"FJ", L"Pacific/Fiji" },
   { L"GMT Standard Time", L"", L"Europe/London" },
@@ -235,7 +232,6 @@ struct
   { L"Hawaiian Standard Time", L"CK", L"Pacific/Rarotonga" },
   { L"Hawaiian Standard Time", L"PF", L"Pacific/Tahiti" },
   { L"Hawaiian Standard Time", L"TK", L"Pacific/Fakaofo" },
-  { L"Hawaiian Standard Time", L"UM", L"Pacific/Johnston" },
   { L"Hawaiian Standard Time", L"US", L"Pacific/Honolulu" },
   { L"Hawaiian Standard Time", L"ZZ", L"Etc/GMT+10" },
   { L"India Standard Time", L"", L"Asia/Kolkata" },
@@ -278,12 +274,12 @@ struct
   { L"Morocco Standard Time", L"EH", L"Africa/El_Aaiun" },
   { L"Morocco Standard Time", L"MA", L"Africa/Casablanca" },
   { L"Mountain Standard Time", L"", L"America/Denver" },
-  { L"Mountain Standard Time", L"CA", L"America/Edmonton America/Cambridge_Bay America/Inuvik America/Yellowknife" },
-  { L"Mountain Standard Time", L"MX", L"America/Ojinaga" },
+  { L"Mountain Standard Time", L"CA", L"America/Edmonton America/Cambridge_Bay America/Inuvik" },
+  { L"Mountain Standard Time", L"MX", L"America/Ciudad_Juarez" },
   { L"Mountain Standard Time", L"US", L"America/Denver America/Boise" },
   { L"Mountain Standard Time", L"ZZ", L"MST7MDT" },
-  { L"Mountain Standard Time (Mexico)", L"", L"America/Chihuahua" },
-  { L"Mountain Standard Time (Mexico)", L"MX", L"America/Chihuahua America/Mazatlan" },
+  { L"Mountain Standard Time (Mexico)", L"", L"America/Mazatlan" },
+  { L"Mountain Standard Time (Mexico)", L"MX", L"America/Mazatlan" },
   { L"Myanmar Standard Time", L"", L"Asia/Rangoon" },
   { L"Myanmar Standard Time", L"CC", L"Indian/Cocos" },
   { L"Myanmar Standard Time", L"MM", L"Asia/Rangoon" },
@@ -315,7 +311,7 @@ struct
   { L"Pacific Standard Time", L"US", L"America/Los_Angeles" },
   { L"Pacific Standard Time", L"ZZ", L"PST8PDT" },
   { L"Pacific Standard Time (Mexico)", L"", L"America/Tijuana" },
-  { L"Pacific Standard Time (Mexico)", L"MX", L"America/Tijuana America/Santa_Isabel" },
+  { L"Pacific Standard Time (Mexico)", L"MX", L"America/Tijuana" },
   { L"Pakistan Standard Time", L"", L"Asia/Karachi" },
   { L"Pakistan Standard Time", L"PK", L"Asia/Karachi" },
   { L"Paraguay Standard Time", L"", L"America/Asuncion" },
@@ -433,7 +429,7 @@ struct
   { L"Taipei Standard Time", L"", L"Asia/Taipei" },
   { L"Taipei Standard Time", L"TW", L"Asia/Taipei" },
   { L"Tasmania Standard Time", L"", L"Australia/Hobart" },
-  { L"Tasmania Standard Time", L"AU", L"Australia/Hobart Australia/Currie Antarctica/Macquarie" },
+  { L"Tasmania Standard Time", L"AU", L"Australia/Hobart Antarctica/Macquarie" },
   { L"Tocantins Standard Time", L"", L"America/Araguaina" },
   { L"Tocantins Standard Time", L"BR", L"America/Araguaina" },
   { L"Tokyo Standard Time", L"", L"Asia/Tokyo" },
@@ -534,7 +530,7 @@ struct
   { L"W. Mongolia Standard Time", L"MN", L"Asia/Hovd" },
   { L"West Asia Standard Time", L"", L"Asia/Tashkent" },
   { L"West Asia Standard Time", L"AQ", L"Antarctica/Mawson" },
-  { L"West Asia Standard Time", L"KZ", L"Asia/Oral Asia/Aqtau Asia/Aqtobe Asia/Atyrau" },
+  { L"West Asia Standard Time", L"KZ", L"Asia/Oral Asia/Almaty Asia/Aqtau Asia/Aqtobe Asia/Atyrau Asia/Qostanay" },
   { L"West Asia Standard Time", L"MV", L"Indian/Maldives" },
   { L"West Asia Standard Time", L"TF", L"Indian/Kerguelen" },
   { L"West Asia Standard Time", L"TJ", L"Asia/Dushanbe" },

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [newlib-cygwin/main] Cygwin: utils: refresh tzmap.h
@ 2024-03-21 21:22 Corinna Vinschen
  0 siblings, 0 replies; 2+ messages in thread
From: Corinna Vinschen @ 2024-03-21 21:22 UTC (permalink / raw)
  To: cygwin-cvs

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=290843bbdab6853fff6ba4105c8faac43c621430

commit 290843bbdab6853fff6ba4105c8faac43c621430
Author:     Corinna Vinschen <corinna@vinschen.de>
AuthorDate: Thu Mar 21 21:43:45 2024 +0100
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Thu Mar 21 21:45:26 2024 +0100

    Cygwin: utils: refresh tzmap.h
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/utils/tzmap.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/winsup/utils/tzmap.h b/winsup/utils/tzmap.h
index c07a8ed1f175..7a8cf44cd920 100644
--- a/winsup/utils/tzmap.h
+++ b/winsup/utils/tzmap.h
@@ -12,14 +12,15 @@
    POSIX-compatible timezone IDs.
 
    The mapping from unicode.org is just a bit incomplete.  It doesn't contain
-   a few timezones available on Windows 8.1:
+   some (deprecated) timezones available since Windows 8.1:
 
-    E. Europe Standard Time
     Mid-Atlantic Standard Time
     Kamchatka Standard Time
 
   as well as a few combinations which got a new Windows timezone name
+  but may still be in use somewhere...
 
+    E. Europe Standard Time/CY
     Eastern Standard Time/TC
     Egypt Standard Time/PS
     Greenwich Standard Time/EH
@@ -27,6 +28,7 @@
     Kaliningrad Standard Time/BY
     SA Pacific Standard Time/HT 
     South Africa Standard Time/LY
+*/
 
 struct
 {
@@ -161,7 +163,6 @@ struct
   { L"E. Africa Standard Time", L"ZZ", L"Etc/GMT-3" },
   { L"E. Australia Standard Time", L"", L"Australia/Brisbane" },
   { L"E. Australia Standard Time", L"AU", L"Australia/Brisbane Australia/Lindeman" },
-  { L"E. Europe Standard Time", L"", L"Asia/Nicosia" },
   { L"E. Europe Standard Time", L"", L"Europe/Chisinau" },
   { L"E. Europe Standard Time", L"CY", L"Asia/Nicosia" },
   { L"E. Europe Standard Time", L"MD", L"Europe/Chisinau" },

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-03-21 21:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-21  9:34 [newlib-cygwin/main] Cygwin: utils: refresh tzmap.h Corinna Vinschen
2024-03-21 21:22 Corinna Vinschen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).