aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/initdb/findtimezone.c70
1 files changed, 35 insertions, 35 deletions
diff --git a/src/bin/initdb/findtimezone.c b/src/bin/initdb/findtimezone.c
index 3c2b8d4e298..82cd7eebdbe 100644
--- a/src/bin/initdb/findtimezone.c
+++ b/src/bin/initdb/findtimezone.c
@@ -833,26 +833,21 @@ static const struct
"Asia/Dhaka"
},
{
- /* (UTC+11:00) Bougainville Island */
- "Bougainville Standard Time", "Bougainville Daylight Time",
- "Pacific/Bougainville"
- },
- {
/* (UTC+03:00) Minsk */
"Belarus Standard Time", "Belarus Daylight Time",
"Europe/Minsk"
},
{
+ /* (UTC+11:00) Bougainville Island */
+ "Bougainville Standard Time", "Bougainville Daylight Time",
+ "Pacific/Bougainville"
+ },
+ {
/* (UTC-01:00) Cabo Verde Is. */
"Cabo Verde Standard Time", "Cabo Verde Daylight Time",
"Atlantic/Cape_Verde"
},
{
- /* (UTC+12:45) Chatham Islands */
- "Chatham Islands Standard Time", "Chatham Islands Daylight Time",
- "Pacific/Chatham"
- },
- {
/* (UTC-06:00) Saskatchewan */
"Canada Central Standard Time", "Canada Central Daylight Time",
"Canada/Saskatchewan"
@@ -914,11 +909,21 @@ static const struct
"America/Mexico_City"
},
{
+ /* (UTC+12:45) Chatham Islands */
+ "Chatham Islands Standard Time", "Chatham Islands Daylight Time",
+ "Pacific/Chatham"
+ },
+ {
/* (UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi */
"China Standard Time", "China Daylight Time",
"Asia/Hong_Kong"
},
{
+ /* (UTC) Coordinated Universal Time */
+ "Coordinated Universal Time", "Coordinated Universal Time",
+ "UTC"
+ },
+ {
/* (UTC-05:00) Havana */
"Cuba Standard Time", "Cuba Daylight Time",
"America/Havana"
@@ -949,6 +954,11 @@ static const struct
"America/Araguaina"
},
{
+ /* (UTC-06:00) Easter Island */
+ "Easter Island Standard Time", "Easter Island Daylight Time",
+ "Pacific/Easter"
+ },
+ {
/* (UTC-05:00) Eastern Time (US & Canada) */
"Eastern Standard Time", "Eastern Daylight Time",
"US/Eastern"
@@ -959,11 +969,6 @@ static const struct
"America/Mexico_City"
},
{
- /* (UTC-06:00) Easter Island */
- "Easter Island Standard Time", "Easter Island Daylight Time",
- "Pacific/Easter"
- },
- {
/* (UTC+02:00) Cairo */
"Egypt Standard Time", "Egypt Daylight Time",
"Africa/Cairo"
@@ -1074,6 +1079,11 @@ static const struct
"America/Punta_Arenas"
},
{
+ /* (UTC+08:00) Kuala Lumpur, Singapore */
+ "Malay Peninsula Standard Time", "Malay Peninsula Daylight Time",
+ "Asia/Kuala_Lumpur"
+ },
+ {
/* (UTC-09:30) Marquesas Islands */
"Marquesas Standard Time", "Marquesas Daylight Time",
"Pacific/Marquesas"
@@ -1299,6 +1309,11 @@ static const struct
"America/Miquelon"
},
{
+ /* (UTC+11:00) Sakhalin */
+ "Sakhalin Standard Time", "Sakhalin Daylight Time",
+ "Asia/Sakhalin"
+ },
+ {
/* (UTC+13:00) Samoa */
"Samoa Standard Time", "Samoa Daylight Time",
"Pacific/Samoa"
@@ -1319,16 +1334,6 @@ static const struct
"Asia/Bangkok"
},
{
- /* (UTC+08:00) Kuala Lumpur, Singapore */
- "Malay Peninsula Standard Time", "Malay Peninsula Daylight Time",
- "Asia/Kuala_Lumpur"
- },
- {
- /* (UTC+11:00) Sakhalin */
- "Sakhalin Standard Time", "Sakhalin Daylight Time",
- "Asia/Sakhalin"
- },
- {
/* (UTC+02:00) Harare, Pretoria */
"South Africa Standard Time", "South Africa Daylight Time",
"Africa/Harare"
@@ -1369,16 +1374,16 @@ static const struct
"Asia/Tokyo"
},
{
- /* (UTC+13:00) Nuku'alofa */
- "Tonga Standard Time", "Tonga Daylight Time",
- "Pacific/Tongatapu"
- },
- {
/* (UTC+07:00) Tomsk */
"Tomsk Standard Time", "Tomsk Daylight Time",
"Asia/Tomsk"
},
{
+ /* (UTC+13:00) Nuku'alofa */
+ "Tonga Standard Time", "Tonga Daylight Time",
+ "Pacific/Tongatapu"
+ },
+ {
/* (UTC+09:00) Chita */
"Transbaikal Standard Time", "Transbaikal Daylight Time",
"Asia/Chita"
@@ -1409,11 +1414,6 @@ static const struct
"US/Arizona"
},
{
- /* (UTC) Coordinated Universal Time */
- "Coordinated Universal Time", "Coordinated Universal Time",
- "UTC"
- },
- {
/* (UTC+12:00) Coordinated Universal Time+12 */
"UTC+12", "UTC+12",
"Etc/GMT+12"