Cygwin: utils: refresh tzmap.h

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

1 files changed, 13 insertions, 17 deletions

diff --git a/winsup/utils/tzmap.h b/winsup/utils/tzmap.h
index 9021181..c07a8ed 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" },