ICU-4615 Changes for Olsen data 2005j.
X-SVN-Rev: 18120
This commit is contained in:
Eric Mader
parent
e6f8f10213
commit
6bdf8eb80a
@ -3,9 +3,9 @@
|
||||
// Corporation and others. All Rights Reserved.
|
||||
//---------------------------------------------------------
|
||||
// Build tool: tz2icu
|
||||
// Build date: Wed Jan 19 17:38:26 2005
|
||||
// Build date: Thu Jun 30 16:39:36 2005
|
||||
// Olson source: ftp://elsie.nci.nih.gov/pub/
|
||||
// Olson version: 2005c
|
||||
// Olson version: 2005j
|
||||
//---------------------------------------------------------
|
||||
// >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! <<
|
||||
// >> !!! >>> DO NOT EDIT <<< !!! <<
|
||||
@ -729,9 +729,9 @@ zoneinfo {
|
||||
:bin { "0001000100010001000100010001000100010001000100010001000100010001000100010001000100" }
|
||||
} //Z#138
|
||||
, /* America/Managua */ :array {
|
||||
:intvector { -1121105688, 105084000, 161758800, 290584800, 299134800, 322034400, 330584400, 694260000, 717310800, 725882400, 912488400 }
|
||||
:intvector { -1121105688, 105084000, 161758800, 290584800, 299134800, 322034400, 330584400, 694260000, 717310800, 725882400, 912488400, 1113112800, 1126414800 }
|
||||
:intvector { -21600, 0, -21600, 3600, -18000, 0 }
|
||||
:bin { "0002000100010001000200" }
|
||||
:bin { "00020001000100010002000100" }
|
||||
} //Z#139
|
||||
, /* America/Manaus */ :array {
|
||||
:intvector { -1767211196, -1206954000, -1191358800, -1175371200, -1159822800, -633816000, -622065600, -602280000, -591829200, -570744000, -560206800, -539121600, -531349200, -191361600, -184194000, -155160000, -150066000, -128894400, -121122000, -99950400, -89586000, -68414400, -57963600, 499752000, 511239600, 530596800, 540270000, 562132800, 571201200, 750830400, 761713200 }
|
||||
@ -790,7 +790,7 @@ zoneinfo {
|
||||
:intvector { -21600, 2002 }
|
||||
} //Z#148
|
||||
, /* America/Montevideo */ :array {
|
||||
:intvector { -1567455316, -1459542600, -1443819600, -1428006600, -1412283600, -1396470600, -1380747600, -1141590600, -1128286800, -1110141000, -1096837200, -1078691400, -1065387600, -1046637000, -1033938000, -1015187400, -1002488400, -983737800, -971038800, -952288200, -938984400, -920838600, -907534800, -883600200, -853621200, -845848800, -334789200, -319672800, -314226000, -309996000, -149720400, -134604000, -118270800, -100044000, -86821200, -68508000, -50446800, -34119000, -18910800, -2583000, 12625200, 28953000, 72932400, 82692000, 132116400, 156911400, 212983200, 250052400, 260244000, 307594800, 325994400, 566449200, 574308000, 597812400, 605671200, 625633200, 636516000, 656478000, 667965600, 688532400, 699415200, 719377200, 730864800, 1095562800, 1110679200 }
|
||||
:intvector { -1567455316, -1459542600, -1443819600, -1428006600, -1412283600, -1396470600, -1380747600, -1141590600, -1128286800, -1110141000, -1096837200, -1078691400, -1065387600, -1046637000, -1033938000, -1015187400, -1002488400, -983737800, -971038800, -952288200, -938984400, -920838600, -907534800, -883600200, -853621200, -845848800, -334789200, -319672800, -314226000, -309996000, -149720400, -134604000, -118270800, -100044000, -86821200, -68508000, -50446800, -34119000, -18910800, -2583000, 12625200, 28953000, 72932400, 82692000, 132116400, 156911400, 212983200, 250052400, 260244000, 307594800, 325994400, 566449200, 574308000, 597812400, 605671200, 625633200, 636516000, 656478000, 667965600, 688532400, 699415200, 719377200, 730864800, 1095562800, 1111896000 }
|
||||
:intvector { -12600, 0, -12600, 1800, -10800, 0, -10800, 1800, -10800, 3600 }
|
||||
:bin { "0001000100010001000100010001000100010001000100010402040204020402040204020302030203020402030402040204020402040204020402040204020402" }
|
||||
} //Z#149
|
||||
@ -872,9 +872,9 @@ zoneinfo {
|
||||
:intvector { 161, 478, 492, 550, 560 }
|
||||
} //Z#161
|
||||
, /* America/Port-au-Prince */ :array {
|
||||
:intvector { -1670483460, 421218000, 436334400, 452062800, 467784000, 483512400, 499233600, 514962000, 530683200, 546411600, 562132800, 576050400, 594194400, 607500000, 625644000, 638949600, 657093600, 671004000, 688543200, 702453600, 719992800, 733903200, 752047200, 765352800, 783496800, 796802400, 814946400, 828856800, 846396000, 860306400, 877845600 }
|
||||
:intvector { -1670483460, 421218000, 436334400, 452062800, 467784000, 483512400, 499233600, 514962000, 530683200, 546411600, 562132800, 576050400, 594194400, 607500000, 625644000, 638949600, 657093600, 671004000, 688543200, 702453600, 719992800, 733903200, 752047200, 765352800, 783496800, 796802400, 814946400, 828856800, 846396000, 860306400, 877845600, 1112504400, 1130644800 }
|
||||
:intvector { -18000, 0, -18000, 3600 }
|
||||
:bin { "00010001000100010001000100010001000100010001000100010001000100" }
|
||||
:bin { "000100010001000100010001000100010001000100010001000100010001000100" }
|
||||
} //Z#162
|
||||
, /* America/Port_of_Spain */ :array {
|
||||
:intvector { -1825098836 }
|
||||
@ -1125,11 +1125,9 @@ zoneinfo {
|
||||
:bin { "00" }
|
||||
} //Z#207
|
||||
, /* Asia/Almaty */ :array {
|
||||
:intvector { -1441170468, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 662666400, 701802000, 717523200, 733262400, 748987200, 764712000, 780436800, 796161600, 811886400 }
|
||||
:intvector { -1441170468, -1247547600, 354909600, 370717200, 386445600, 402253200, 417981600, 433789200, 449604000, 465336000, 481060800, 496785600, 512510400, 528235200, 543960000, 559684800, 575409600, 591134400, 606859200, 622584000, 638308800, 654638400, 662666400, 701802000, 717523200, 733262400, 748987200, 764712000, 780436800, 796161600, 811886400, 828216000, 846360000, 859665600, 877809600, 891115200, 909259200, 922564800, 941313600, 954014400, 972763200, 985464000, 1004212800, 1017518400, 1035662400, 1048968000, 1067112000, 1080417600, 1099166400, 1110823200 }
|
||||
:intvector { 18000, 0, 21600, 0, 21600, 3600 }
|
||||
:bin { "00010201020102010201020102010201020102010201010201020102010201" }
|
||||
"RussiaAsia"
|
||||
:intvector { 21600, 1996 }
|
||||
:bin { "0001020102010201020102010201020102010201020101020102010201020102010201020102010201020102010201020101" }
|
||||
} //Z#208
|
||||
, /* Asia/Amman */ :array {
|
||||
:intvector { -1230776624, 108165600, 118270800, 136591200, 149806800, 168127200, 181342800, 199749600, 215643600, 231285600, 244501200, 262735200, 275950800, 481154400, 496962000, 512949600, 528670800, 544399200, 560120400, 575848800, 592174800, 610581600, 623624400, 641167200, 655074000, 671839200, 685918800, 702856800, 717973200, 733701600, 749422800, 765151200, 779662800, 797205600, 811116000, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 930780000, 938642400 }
|
||||
@ -1146,18 +1144,14 @@ zoneinfo {
|
||||
:intvector { 43200, 1996 }
|
||||
} //Z#210
|
||||
, /* Asia/Aqtau */ :array {
|
||||
:intvector { -1441164064, -1247544000, -220942800, 370724400, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 662670000, 692823600, 701805600, 717526800, 733266000, 748990800, 764715600, 780440400, 796165200, 811893600 }
|
||||
:intvector { -1441164064, -1247544000, -220942800, 370724400, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 662670000, 692823600, 701805600, 717526800, 733266000, 748990800, 764715600, 780440400, 796165200, 811893600, 828223200, 846367200, 859672800, 877816800, 891122400, 909266400, 922572000, 941320800, 954021600, 972770400, 985471200, 1004220000, 1017525600, 1035669600, 1048975200, 1067119200, 1080424800, 1099173600, 1110830400 }
|
||||
:intvector { 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 }
|
||||
:bin { "0002020403020302030203020302030203020302030202020302030203020100" }
|
||||
"RussiaAsia"
|
||||
:intvector { 14400, 1996 }
|
||||
:bin { "000202040302030203020302030203020302030203020202030203020302010001000100010001000100010001000100010000" }
|
||||
} //Z#211
|
||||
, /* Asia/Aqtobe */ :array {
|
||||
:intvector { -1441165720, -1247544000, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 662670000, 692823600, 701805600, 717526800, 733266000, 748990800, 764715600, 780440400, 796165200, 811890000 }
|
||||
:intvector { -1441165720, -1247544000, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 662670000, 692823600, 701805600, 717526800, 733266000, 748990800, 764715600, 780440400, 796165200, 811890000, 828219600, 846363600, 859669200, 877813200, 891118800, 909262800, 922568400, 941317200, 954018000, 972766800, 985467600, 1004216400, 1017522000, 1035666000, 1048971600, 1067115600, 1080421200, 1099170000, 1110826800 }
|
||||
:intvector { 14400, 0, 18000, 0, 18000, 3600, 21600, 0 }
|
||||
:bin { "0001020302010201020102010201020102010201020101010201020102010201" }
|
||||
"RussiaAsia"
|
||||
:intvector { 18000, 1996 }
|
||||
:bin { "000102030201020102010201020102010201020102010101020102010201020102010201020102010201020102010201020101" }
|
||||
} //Z#212
|
||||
, /* Asia/Ashgabat */ :array {
|
||||
:intvector { -1441166012, -1247544000, 354913200, 370720800, 386449200, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 670366800, 686095200, 688507200, 695772000 }
|
||||
@ -1179,9 +1173,9 @@ zoneinfo {
|
||||
:bin { "0100" }
|
||||
} //Z#216
|
||||
, /* Asia/Baku */ :array {
|
||||
:intvector { -1441163964, -405140400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622591200, 638316000, 654645600, 670370400, 683496000, 686098800, 701812800, 717534000, 717548400, 820440000, 828234000, 846378000, 852062400 }
|
||||
:intvector { -1441163964, -405140400, 354916800, 370724400, 386452800, 402260400, 417988800, 433796400, 449611200, 465343200, 481068000, 496792800, 512517600, 528242400, 543967200, 559692000, 575416800, 591141600, 606866400, 622591200, 638316000, 654645600, 670370400, 683496000, 686098800, 701812800, 717534000, 820440000, 828234000, 846378000, 852062400 }
|
||||
:intvector { 10800, 0, 10800, 3600, 14400, 0, 14400, 3600 }
|
||||
:bin { "0002030203020302030203020302030203020302030201010001000203030202" }
|
||||
:bin { "00020302030203020302030203020302030203020302010100010203030202" }
|
||||
"Azer"
|
||||
:intvector { 14400, 1997 }
|
||||
} //Z#217
|
||||
@ -1307,7 +1301,7 @@ zoneinfo {
|
||||
:bin { "000100" }
|
||||
} //Z#240
|
||||
, /* Asia/Jerusalem */ :array {
|
||||
:intvector { -1641003640, -933645600, -857358000, -844300800, -825822000, -812685600, -794199600, -779853600, -762656400, -748310400, -731127600, -681962400, -673243200, -667962000, -652327200, -636426000, -622087200, -608947200, -591847200, -572486400, -558576000, -542851200, -527731200, -514425600, -490845600, -482986800, -459475200, -451537200, -428551200, -418262400, -400032000, -387428400, 142380000, 150843600, 167176800, 178664400, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576540000, 589237200, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 826840800, 842821200, 858895200, 874184400, 890344800, 905029200, 923011200, 936313200, 955670400, 970783200, 986770800, 1001282400, 1017356400, 1033941600, 1048806000, 1065132000, 1081292400, 1095804000, 1114380000, 1128805200, 1144965600, 1159650000, 1175637600, 1189890000, 1208728800, 1223154000, 1239314400, 1253998800, 1269986400, 1284238800, 1303250400, 1317502800, 1333836000, 1348347600, 1364335200, 1378587600, 1397599200, 1411851600, 1428184800, 1442696400, 1461448800, 1475960400, 1491948000, 1506200400, 1522533600, 1537045200, 1555797600, 1570309200, 1586469600, 1601154000, 1616968800, 1631394000, 1650146400, 1664658000, 1680818400, 1695502800, 1713909600, 1728162000, 1744581600, 1759006800, 1775167200, 1789851600, 1808431200, 1823115600, 1839103200, 1853355600, 1869688800, 1884200400, 1902780000, 1917464400, 1933452000, 1947704400, 1964037600, 1978549200, 1997128800, 2011813200, 2027800800, 2042053200, 2061064800, 2075317200, 2091650400, 2106162000, 2122149600, 2136402000 }
|
||||
:intvector { -1641003640, -933645600, -857358000, -844300800, -825822000, -812685600, -794199600, -779853600, -762656400, -748310400, -731127600, -681962400, -673243200, -667962000, -652327200, -636426000, -622087200, -608947200, -591847200, -572486400, -558576000, -542851200, -527731200, -514425600, -490845600, -482986800, -459475200, -451537200, -428551200, -418262400, -400032000, -387428400, 142380000, 150843600, 167176800, 178664400, 482277600, 495579600, 516751200, 526424400, 545436000, 558478800, 576540000, 589237200, 609890400, 620773200, 638316000, 651618000, 669765600, 683672400, 701820000, 715726800, 733701600, 747176400, 765151200, 778021200, 796600800, 810075600, 826840800, 842821200, 858895200, 874184400, 890344800, 905029200, 923011200, 936313200, 955670400, 970783200, 986770800, 1001282400, 1017356400, 1033941600, 1048806000, 1065132000, 1081292400, 1095804000, 1112313600, 1128812400, 1143763200, 1159657200, 1175212800, 1189897200, 1206662400, 1223161200, 1238112000, 1254006000, 1269561600, 1284246000, 1301616000, 1317510000, 1333065600, 1348354800, 1364515200, 1378594800, 1395964800, 1411858800, 1427414400, 1442703600, 1459468800, 1475967600, 1490918400, 1506207600, 1522368000, 1537052400, 1553817600, 1570316400, 1585267200, 1601161200, 1616716800, 1631401200, 1648771200, 1664665200, 1680220800, 1695510000, 1711670400, 1728169200, 1743120000, 1759014000, 1774569600, 1789858800, 1806019200, 1823122800, 1838073600, 1853362800, 1869523200, 1884207600, 1900972800, 1917471600, 1932422400, 1947711600, 1963872000, 1978556400, 1995926400, 2011820400, 2027376000, 2042060400, 2058825600, 2075324400, 2090275200, 2106169200, 2121724800, 2136409200 }
|
||||
:intvector { 7200, 0, 7200, 3600, 7200, 7200 }
|
||||
:bin { "00010001000100010001000201000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" }
|
||||
:intvector { 241, 281, 470 }
|
||||
@ -1415,11 +1409,9 @@ zoneinfo {
|
||||
:intvector { 21600, 1996 }
|
||||
} //Z#259
|
||||
, /* Asia/Oral */ :array {
|
||||
:intvector { -1441164324, -1247544000, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622591200, 638316000, 654645600, 662673600, 692827200, 701809200, 717530400, 733269600, 748994400, 764719200, 780444000, 796168800, 811893600 }
|
||||
:intvector { -1441164324, -1247544000, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622591200, 638316000, 654645600, 662673600, 692827200, 701809200, 717530400, 733269600, 748994400, 764719200, 780444000, 796168800, 811893600, 828223200, 846367200, 859672800, 877816800, 891122400, 909266400, 922572000, 941320800, 954021600, 972770400, 985471200, 1004220000, 1017525600, 1035669600, 1048975200, 1067119200, 1080424800, 1099173600, 1110830400 }
|
||||
:intvector { 14400, 0, 14400, 3600, 18000, 0, 18000, 3600, 21600, 0 }
|
||||
:bin { "0002030403020302030203020302030203020100010000000100010001000100" }
|
||||
"RussiaAsia"
|
||||
:intvector { 14400, 1996 }
|
||||
:bin { "000203040302030203020302030203020302010001000000010001000100010001000100010001000100010001000100010000" }
|
||||
} //Z#260
|
||||
, /* Asia/Phnom_Penh */ :array {
|
||||
:intvector { -2005973980, -1855983920, -1819954800, -1220428800 }
|
||||
@ -1442,11 +1434,9 @@ zoneinfo {
|
||||
:bin { "0100" }
|
||||
} //Z#264
|
||||
, /* Asia/Qyzylorda */ :array {
|
||||
:intvector { -1441167712, -1247544000, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 662670000, 692823600, 695768400, 701802000, 717523200, 733262400, 748987200, 764712000, 780436800, 796161600, 811886400 }
|
||||
:intvector { -1441167712, -1247544000, 354913200, 370720800, 386445600, 402256800, 417985200, 433792800, 449607600, 465339600, 481064400, 496789200, 512514000, 528238800, 543963600, 559688400, 575413200, 591138000, 606862800, 622587600, 638312400, 654642000, 662670000, 692823600, 695768400, 701802000, 717523200, 733262400, 748987200, 764712000, 780436800, 796161600, 811886400, 828216000, 846360000, 859665600, 877809600, 891115200, 909259200, 922564800, 941313600, 954014400, 972763200, 985464000, 1004212800, 1017518400, 1035662400, 1048968000, 1067112000, 1080417600, 1099166400, 1110823200 }
|
||||
:intvector { 14400, 0, 18000, 0, 18000, 3600, 21600, 0, 21600, 3600 }
|
||||
:bin { "000102030201020102010201020102010201020102010101030403040304030403" }
|
||||
"RussiaAsia"
|
||||
:intvector { 21600, 1996 }
|
||||
:bin { "00010203020102010201020102010201020102010201010103040304030403040304030403040304030403040304030403040303" }
|
||||
} //Z#265
|
||||
, /* Asia/Rangoon */ :array {
|
||||
:intvector { -1577946276, -873268200, -778410000 }
|
||||
@ -1531,7 +1521,7 @@ zoneinfo {
|
||||
:intvector { 10800, 1996 }
|
||||
} //Z#279
|
||||
, /* Asia/Tehran */ :array {
|
||||
:intvector { -1704165944, -757394744, 247177800, 259272000, 277758000, 283982400, 290809800, 306531000, 322432200, 338499000, 673216200, 685481400, 701209800, 717103800, 732745800, 748639800, 764281800, 780175800, 795817800, 811711800, 827353800, 843247800, 858976200, 874870200, 890512200, 906406200, 922048200, 937942200, 953584200, 969478200, 985206600, 1001100600, 1016742600, 1032636600, 1048278600, 1064172600, 1079814600, 1095708600, 1111437000, 1127331000, 1142973000, 1158867000, 1174509000, 1190403000, 1206045000, 1221939000, 1237667400, 1253561400, 1269203400, 1285097400, 1300739400, 1316633400, 1332275400, 1348169400, 1363897800, 1379791800, 1395433800, 1411327800, 1426969800, 1442863800, 1458505800, 1474399800, 1490128200, 1506022200, 1521664200, 1537558200, 1553200200, 1569094200, 1584736200, 1600630200, 1616358600, 1632252600, 1647894600, 1663788600, 1679430600, 1695324600, 1710966600, 1726860600, 1742502600, 1758396600, 1774125000, 1790019000, 1805661000, 1821555000, 1837197000, 1853091000, 1868733000, 1884627000, 1900355400, 1916249400, 1931891400, 1947785400, 1963427400, 1979321400, 1994963400, 2010857400, 2026585800, 2042479800, 2058121800, 2074015800, 2089657800, 2105551800, 2121193800, 2137087800 }
|
||||
:intvector { -1704165944, -757394744, 247177800, 259272000, 277758000, 283982400, 290809800, 306531000, 322432200, 338499000, 673216200, 685481400, 701209800, 717103800, 732745800, 748639800, 764281800, 780175800, 795817800, 811711800, 827353800, 843247800, 858976200, 874870200, 890512200, 906406200, 922048200, 937942200, 953584200, 969478200, 985206600, 1001100600, 1016742600, 1032636600, 1048278600, 1064172600, 1079814600, 1095708600, 1111437000, 1127331000, 1142973000, 1158867000, 1174509000, 1190403000, 1206045000, 1221939000, 1237667400, 1253561400, 1269203400, 1285097400, 1300739400, 1316633400, 1332275400, 1348169400, 1363897800, 1379791800, 1395433800, 1411327800, 1426969800, 1442863800, 1458505800, 1474399800, 1490128200, 1506022200, 1521664200, 1537558200, 1553200200, 1569094200, 1584736200, 1600630200, 1616358600, 1632252600, 1647894600, 1663788600, 1679430600, 1695324600, 1710966600, 1726860600, 1742589000, 1758483000, 1774125000, 1790019000, 1805661000, 1821555000, 1837197000, 1853091000, 1868733000, 1884627000, 1900355400, 1916249400, 1931891400, 1947785400, 1963427400, 1979321400, 1994963400, 2010857400, 2026585800, 2042479800, 2058121800, 2074015800, 2089657800, 2105551800, 2121193800, 2137087800 }
|
||||
:intvector { 12344, 0, 12600, 0, 12600, 3600, 14400, 0, 14400, 3600 }
|
||||
:bin { "0001030403010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
|
||||
:intvector { 280, 469 }
|
||||
@ -2289,9 +2279,9 @@ zoneinfo {
|
||||
:bin { "000100" }
|
||||
} //Z#458
|
||||
, /* Indian/Chagos */ :array {
|
||||
:intvector { 820436400 }
|
||||
:intvector { 21600, 0 }
|
||||
:bin { "00" }
|
||||
:intvector { -1988167780, 820436400 }
|
||||
:intvector { 18000, 0, 21600, 0 }
|
||||
:bin { "0001" }
|
||||
} //Z#459
|
||||
, /* Indian/Christmas */ :array {
|
||||
:intvector { }
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -u -r ../tzcode.orig/Makefile ./Makefile
|
||||
--- ../tzcode.orig/Makefile 2003-12-15 06:33:34.000000000 -0800
|
||||
+++ ./Makefile 2004-05-24 14:30:31.659356800 -0700
|
||||
diff -ur ../tzcode.orig/Makefile ./Makefile
|
||||
--- ../tzcode.orig/Makefile 2005-06-13 11:33:54.000000000 -0700
|
||||
+++ ./Makefile 2005-06-30 16:14:15.000000000 -0700
|
||||
@@ -40,7 +40,7 @@
|
||||
# (and subdirectories).
|
||||
# Use an absolute path name for TZDIR unless you're just testing the software.
|
||||
@ -10,7 +10,7 @@ diff -u -r ../tzcode.orig/Makefile ./Makefile
|
||||
|
||||
# The "tzselect", "zic", and "zdump" commands get installed in. . .
|
||||
|
||||
@@ -239,9 +239,11 @@
|
||||
@@ -240,9 +240,11 @@
|
||||
|
||||
###############################################################################
|
||||
|
||||
@ -22,8 +22,8 @@ diff -u -r ../tzcode.orig/Makefile ./Makefile
|
||||
+
|
||||
TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c
|
||||
TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o
|
||||
TZDSRCS= zdump.c localtime.c asctime.c ialloc.c
|
||||
@@ -275,7 +277,10 @@
|
||||
TZDSRCS= zdump.c localtime.c ialloc.c
|
||||
@@ -276,7 +278,10 @@
|
||||
|
||||
SHELL= /bin/sh
|
||||
|
||||
@ -35,7 +35,7 @@ diff -u -r ../tzcode.orig/Makefile ./Makefile
|
||||
|
||||
ALL: all date
|
||||
|
||||
@@ -308,9 +313,12 @@
|
||||
@@ -309,9 +314,12 @@
|
||||
zdump: $(TZDOBJS)
|
||||
$(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
|
||||
|
||||
@ -49,7 +49,7 @@ diff -u -r ../tzcode.orig/Makefile ./Makefile
|
||||
yearistype: yearistype.sh
|
||||
cp yearistype.sh yearistype
|
||||
chmod +x yearistype
|
||||
@@ -321,6 +329,9 @@
|
||||
@@ -322,6 +330,9 @@
|
||||
right_only: zic leapseconds $(TDATA)
|
||||
$(ZIC) -y $(YEARISTYPE) -d $(TZDIR) -L leapseconds $(TDATA)
|
||||
|
||||
@ -59,10 +59,10 @@ diff -u -r ../tzcode.orig/Makefile ./Makefile
|
||||
# In earlier versions of this makefile, the other two directories were
|
||||
# subdirectories of $(TZDIR). However, this led to configuration errors.
|
||||
# For example, with posix_right under the earlier scheme,
|
||||
diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
--- ../tzcode.orig/zic.c 2003-12-15 06:36:35.000000000 -0800
|
||||
+++ ./zic.c 2004-05-24 14:03:43.937566400 -0700
|
||||
@@ -13,6 +13,20 @@
|
||||
diff -ur ../tzcode.orig/zic.c ./zic.c
|
||||
--- ../tzcode.orig/zic.c 2005-05-26 11:54:07.000000000 -0700
|
||||
+++ ./zic.c 2005-06-30 16:39:56.000000000 -0700
|
||||
@@ -23,6 +23,20 @@
|
||||
#define MKDIR_UMASK 0755
|
||||
#endif
|
||||
|
||||
@ -82,8 +82,8 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
+
|
||||
/*
|
||||
** On some ancient hosts, predicates like `isspace(C)' are defined
|
||||
** only if isascii(C) || C == EOF. Modern hosts obey the C Standard,
|
||||
@@ -86,8 +100,14 @@
|
||||
** only if isascii(C) || C == EOF. Modern hosts obey the C Standard,
|
||||
@@ -96,8 +110,14 @@
|
||||
extern int optind;
|
||||
|
||||
static void addtt P((zic_t starttime, int type));
|
||||
@ -98,7 +98,7 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
static void leapadd P((zic_t t, int positive, int rolling, int count));
|
||||
static void adjleap P((void));
|
||||
static void associate P((void));
|
||||
@@ -256,6 +276,18 @@
|
||||
@@ -266,6 +286,18 @@
|
||||
const int l_value;
|
||||
};
|
||||
|
||||
@ -117,7 +117,7 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
static struct lookup const * byword P((const char * string,
|
||||
const struct lookup * lp));
|
||||
|
||||
@@ -338,6 +370,11 @@
|
||||
@@ -348,6 +380,11 @@
|
||||
unsigned char type;
|
||||
} attypes[TZ_MAX_TIMES];
|
||||
static long gmtoffs[TZ_MAX_TYPES];
|
||||
@ -129,7 +129,7 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
static char isdsts[TZ_MAX_TYPES];
|
||||
static unsigned char abbrinds[TZ_MAX_TYPES];
|
||||
static char ttisstds[TZ_MAX_TYPES];
|
||||
@@ -447,6 +484,62 @@
|
||||
@@ -459,6 +496,62 @@
|
||||
(void) exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
@ -192,7 +192,7 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
static const char * psxrules;
|
||||
static const char * lcltime;
|
||||
static const char * directory;
|
||||
@@ -554,6 +647,14 @@
|
||||
@@ -566,6 +659,14 @@
|
||||
adjleap();
|
||||
}
|
||||
|
||||
@ -207,17 +207,17 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
for (i = optind; i < argc; ++i)
|
||||
infile(argv[i]);
|
||||
if (errors)
|
||||
@@ -573,6 +674,9 @@
|
||||
@@ -585,6 +686,9 @@
|
||||
for (i = 0; i < nlinks; ++i) {
|
||||
eat(links[i].l_filename, links[i].l_linenum);
|
||||
dolink(links[i].l_from, links[i].l_to);
|
||||
+#ifdef ICU
|
||||
+ emit_icu_link(icuFile, links[i].l_from, links[i].l_to);
|
||||
+#endif
|
||||
}
|
||||
if (lcltime != NULL) {
|
||||
eat("command line", 1);
|
||||
@@ -582,6 +686,11 @@
|
||||
if (noise)
|
||||
for (j = 0; j < nlinks; ++j)
|
||||
if (strcmp(links[i].l_to,
|
||||
@@ -599,6 +703,11 @@
|
||||
eat("command line", 1);
|
||||
dolink(psxrules, TZDEFRULES);
|
||||
}
|
||||
@ -229,7 +229,7 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
return (errors == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
|
||||
}
|
||||
|
||||
@@ -642,7 +751,9 @@
|
||||
@@ -664,7 +773,9 @@
|
||||
(void) fprintf(stderr,
|
||||
_("%s: Can't link from %s to %s: %s\n"),
|
||||
progname, fromname, toname, e);
|
||||
@ -239,20 +239,20 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
}
|
||||
}
|
||||
ifree(fromname);
|
||||
@@ -1503,7 +1614,12 @@
|
||||
@@ -1539,7 +1650,12 @@
|
||||
convert(eitol(timecnt), tzh.tzh_timecnt);
|
||||
convert(eitol(typecnt), tzh.tzh_typecnt);
|
||||
convert(eitol(charcnt), tzh.tzh_charcnt);
|
||||
+#ifdef ICU
|
||||
+ * (ICUZoneinfoVersion*) &tzh.tzh_reserved = TZ_ICU_VERSION;
|
||||
+ (void) strncpy(tzh.tzh_magic, TZ_ICU_MAGIC, sizeof tzh.tzh_magic);
|
||||
+ (void) strncpy(tzh.tzh_magic, TZ_ICU_MAGIC, sizeof tzh.tzh_magic);
|
||||
+#else
|
||||
(void) strncpy(tzh.tzh_magic, TZ_MAGIC, sizeof tzh.tzh_magic);
|
||||
+#endif
|
||||
#define DO(field) (void) fwrite((void *) tzh.field, (size_t) sizeof tzh.field, (size_t) 1, fp)
|
||||
#define DO(field) (void) fwrite((void *) tzh.field, \
|
||||
(size_t) sizeof tzh.field, (size_t) 1, fp)
|
||||
DO(tzh_magic);
|
||||
DO(tzh_reserved);
|
||||
@@ -1527,7 +1643,12 @@
|
||||
@@ -1564,7 +1680,12 @@
|
||||
(void) fwrite((void *) types, (size_t) sizeof types[0],
|
||||
(size_t) timecnt, fp);
|
||||
for (i = 0; i < typecnt; ++i) {
|
||||
@ -265,7 +265,7 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
(void) putc(isdsts[i], fp);
|
||||
(void) putc(abbrinds[i], fp);
|
||||
}
|
||||
@@ -1583,6 +1704,24 @@
|
||||
@@ -1620,6 +1741,24 @@
|
||||
}
|
||||
}
|
||||
|
||||
@ -290,7 +290,7 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
static void
|
||||
outzone(zpfirst, zonecount)
|
||||
const struct zone * const zpfirst;
|
||||
@@ -1601,6 +1740,11 @@
|
||||
@@ -1638,6 +1777,11 @@
|
||||
register int startttisgmt;
|
||||
register int type;
|
||||
char startbuf[BUFSIZ];
|
||||
@ -302,7 +302,7 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
|
||||
INITIALIZE(untiltime);
|
||||
INITIALIZE(starttime);
|
||||
@@ -1630,11 +1774,55 @@
|
||||
@@ -1667,11 +1811,55 @@
|
||||
eat(zp->z_filename, zp->z_linenum);
|
||||
*startbuf = '\0';
|
||||
startoff = zp->z_gmtoff;
|
||||
@ -358,7 +358,7 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
startbuf, stdoff != 0, startttisstd,
|
||||
startttisgmt);
|
||||
if (usestart) {
|
||||
@@ -1708,6 +1896,15 @@
|
||||
@@ -1745,6 +1933,15 @@
|
||||
break; /* go on to next year */
|
||||
rp = &zp->z_rules[k];
|
||||
rp->r_todo = FALSE;
|
||||
@ -374,7 +374,7 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
if (useuntil && ktime >= untiltime)
|
||||
break;
|
||||
stdoff = rp->r_stdoff;
|
||||
@@ -1735,8 +1932,14 @@
|
||||
@@ -1773,8 +1970,14 @@
|
||||
doabbr(buf, zp->z_format, rp->r_abbrvar,
|
||||
rp->r_stdoff != 0);
|
||||
offset = oadd(zp->z_gmtoff, rp->r_stdoff);
|
||||
@ -389,7 +389,7 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
addtt(ktime, type);
|
||||
}
|
||||
}
|
||||
@@ -1750,10 +1953,19 @@
|
||||
@@ -1788,10 +1991,19 @@
|
||||
if (*startbuf == '\0')
|
||||
error(_("can't determine time zone abbreviation to use just after until time"));
|
||||
else addtt(starttime,
|
||||
@ -409,7 +409,7 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
}
|
||||
/*
|
||||
** Now we may get to set starttime for the next zone line.
|
||||
@@ -1779,6 +1991,10 @@
|
||||
@@ -1817,6 +2029,10 @@
|
||||
if (starttime <= min_time ||
|
||||
(timecnt == 1 && attypes[0].at < min_time)) {
|
||||
gmtoffs[0] = gmtoffs[type];
|
||||
@ -420,7 +420,7 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
isdsts[0] = isdsts[type];
|
||||
ttisstds[0] = ttisstds[type];
|
||||
ttisgmts[0] = ttisgmts[type];
|
||||
@@ -1800,8 +2016,15 @@
|
||||
@@ -1838,8 +2054,15 @@
|
||||
}
|
||||
|
||||
static int
|
||||
@ -436,7 +436,7 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
const char * const abbr;
|
||||
const int isdst;
|
||||
const int ttisstd;
|
||||
@@ -1821,12 +2044,25 @@
|
||||
@@ -1859,12 +2082,25 @@
|
||||
error(_("internal error - addtype called with bad ttisgmt"));
|
||||
(void) exit(EXIT_FAILURE);
|
||||
}
|
||||
@ -462,7 +462,7 @@ diff -u -r ../tzcode.orig/zic.c ./zic.c
|
||||
strcmp(abbr, &chars[abbrinds[i]]) == 0 &&
|
||||
ttisstd == ttisstds[i] &&
|
||||
ttisgmt == ttisgmts[i])
|
||||
@@ -1841,6 +2077,10 @@
|
||||
@@ -1879,6 +2115,10 @@
|
||||
(void) exit(EXIT_FAILURE);
|
||||
}
|
||||
gmtoffs[i] = gmtoff;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user