diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-02-16 10:13:02 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-02-16 10:13:02 +0100 |
| commit | fd5a0b31640419ca63d1ddeaffd6d3cf2a741814 (patch) | |
| tree | bfd17d84c5181d7b98d7d66f56573f4fc897e31c /ext/date/lib | |
| parent | 01fcdff3849c3691d9aaeaab735846ab6d8895ca (diff) | |
| download | php-upstream/5.3.5.tar.gz | |
Imported Upstream version 5.3.5upstream/5.3.5
Diffstat (limited to 'ext/date/lib')
| -rw-r--r-- | ext/date/lib/parse_date.c | 12 | ||||
| -rw-r--r-- | ext/date/lib/parse_date.c.orig | 206 | ||||
| -rw-r--r-- | ext/date/lib/parse_date.re | 10 | ||||
| -rw-r--r-- | ext/date/lib/parse_iso_intervals.c | 4 | ||||
| -rw-r--r-- | ext/date/lib/timelib.c | 17 | ||||
| -rw-r--r-- | ext/date/lib/timelib.h | 3 | ||||
| -rw-r--r-- | ext/date/lib/timezonedb.h | 1333 | ||||
| -rw-r--r-- | ext/date/lib/tm2unixtime.c | 3 | ||||
| -rw-r--r-- | ext/date/lib/unixtime2tm.c | 8 |
9 files changed, 847 insertions, 749 deletions
diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c index 641a32901..4f60d51f9 100644 --- a/ext/date/lib/parse_date.c +++ b/ext/date/lib/parse_date.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Fri Mar 26 12:00:44 2010 */ +/* Generated by re2c 0.13.5 on Sat Nov 13 14:58:02 2010 */ /* +----------------------------------------------------------------------+ | PHP Version 5 | @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_date.c 301252 2010-07-13 23:59:54Z kalle $ */ +/* $Id: parse_date.c 305316 2010-11-13 15:01:48Z derick $ */ #include "timelib.h" @@ -24693,6 +24693,10 @@ timelib_time* timelib_strtotime(char *s, int len, struct timelib_error_container #endif } while(t != EOI); + /* do funky checking whether the parsed time was valid time */ + if (in.time->have_time && !timelib_valid_time( in.time->h, in.time->i, in.time->s)) { + add_warning(&in, "The parsed time was invalid"); + } /* do funky checking whether the parsed date was valid date */ if (in.time->have_date && !timelib_valid_date( in.time->y, in.time->m, in.time->d)) { add_warning(&in, "The parsed date was invalid"); @@ -24888,7 +24892,7 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim break; case '#': /* separation symbol */ - if (*ptr == ';' || *ptr == ':' || *ptr == '/' || *ptr == '.' || *ptr == ',' || *ptr == '-') { + if (*ptr == ';' || *ptr == ':' || *ptr == '/' || *ptr == '.' || *ptr == ',' || *ptr == '-' || *ptr == '(' || *ptr == ')') { ++ptr; } else { add_pbf_error(s, "The separation symbol ([;:/.,-]) could not be found", string, begin); @@ -24901,6 +24905,8 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim case '.': case ',': case '-': + case '(': + case ')': if (*ptr == *fptr) { ++ptr; } else { diff --git a/ext/date/lib/parse_date.c.orig b/ext/date/lib/parse_date.c.orig index fa86b2898..935f3e5a9 100644 --- a/ext/date/lib/parse_date.c.orig +++ b/ext/date/lib/parse_date.c.orig @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Fri Mar 26 12:00:44 2010 */ +/* Generated by re2c 0.13.5 on Sat Nov 13 14:58:02 2010 */ #line 1 "ext/date/lib/parse_date.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_date.c 301252 2010-07-13 23:59:54Z kalle $ */ +/* $Id: parse_date.c 305316 2010-11-13 15:01:48Z derick $ */ #include "timelib.h" @@ -843,11 +843,11 @@ static int scan(Scanner *s) std: s->tok = cursor; s->len = 0; -#line 967 "ext/date/lib/parse_date.re" +#line 969 "ext/date/lib/parse_date.re" -#line 849 "ext/date/lib/parse_date.c" +#line 851 "ext/date/lib/parse_date.c" { YYCTYPE yych; unsigned int yyaccept = 0; @@ -967,7 +967,7 @@ std: } yy2: YYDEBUG(2, *YYCURSOR); -#line 1052 "ext/date/lib/parse_date.re" +#line 1054 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("firstdayof | lastdayof"); TIMELIB_INIT; @@ -983,7 +983,7 @@ yy2: TIMELIB_DEINIT; return TIMELIB_LF_DAY_OF_MONTH; } -#line 985 "ext/date/lib/parse_date.c" +#line 987 "ext/date/lib/parse_date.c" yy3: YYDEBUG(3, *YYCURSOR); ++YYCURSOR; @@ -1006,7 +1006,7 @@ yy3: } yy4: YYDEBUG(4, *YYCURSOR); -#line 1634 "ext/date/lib/parse_date.re" +#line 1636 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("tzcorrection | tz"); @@ -1019,7 +1019,7 @@ yy4: TIMELIB_DEINIT; return TIMELIB_TIMEZONE; } -#line 1021 "ext/date/lib/parse_date.c" +#line 1023 "ext/date/lib/parse_date.c" yy5: YYDEBUG(5, *YYCURSOR); yych = *++YYCURSOR; @@ -1330,12 +1330,12 @@ yy12: if (yych <= '9') goto yy1385; yy13: YYDEBUG(13, *YYCURSOR); -#line 1729 "ext/date/lib/parse_date.re" +#line 1731 "ext/date/lib/parse_date.re" { add_error(s, "Unexpected character"); goto std; } -#line 1337 "ext/date/lib/parse_date.c" +#line 1339 "ext/date/lib/parse_date.c" yy14: YYDEBUG(14, *YYCURSOR); yych = *++YYCURSOR; @@ -2392,11 +2392,11 @@ yy49: if (yych <= '9') goto yy55; yy50: YYDEBUG(50, *YYCURSOR); -#line 1718 "ext/date/lib/parse_date.re" +#line 1720 "ext/date/lib/parse_date.re" { goto std; } -#line 2398 "ext/date/lib/parse_date.c" +#line 2400 "ext/date/lib/parse_date.c" yy51: YYDEBUG(51, *YYCURSOR); yych = *++YYCURSOR; @@ -2405,12 +2405,12 @@ yy52: YYDEBUG(52, *YYCURSOR); ++YYCURSOR; YYDEBUG(53, *YYCURSOR); -#line 1723 "ext/date/lib/parse_date.re" +#line 1725 "ext/date/lib/parse_date.re" { s->pos = cursor; s->line++; goto std; } -#line 2412 "ext/date/lib/parse_date.c" +#line 2414 "ext/date/lib/parse_date.c" yy54: YYDEBUG(54, *YYCURSOR); yych = *++YYCURSOR; @@ -2797,7 +2797,7 @@ yy72: if (yych == 's') goto yy74; yy73: YYDEBUG(73, *YYCURSOR); -#line 1702 "ext/date/lib/parse_date.re" +#line 1704 "ext/date/lib/parse_date.re" { timelib_ull i; DEBUG_OUTPUT("relative"); @@ -2812,7 +2812,7 @@ yy73: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 2814 "ext/date/lib/parse_date.c" +#line 2816 "ext/date/lib/parse_date.c" yy74: YYDEBUG(74, *YYCURSOR); yych = *++YYCURSOR; @@ -3574,7 +3574,7 @@ yy166: } yy167: YYDEBUG(167, *YYCURSOR); -#line 1565 "ext/date/lib/parse_date.re" +#line 1567 "ext/date/lib/parse_date.re" { const timelib_relunit* relunit; DEBUG_OUTPUT("daytext"); @@ -3591,7 +3591,7 @@ yy167: TIMELIB_DEINIT; return TIMELIB_WEEKDAY; } -#line 3593 "ext/date/lib/parse_date.c" +#line 3595 "ext/date/lib/parse_date.c" yy168: YYDEBUG(168, *YYCURSOR); yych = *++YYCURSOR; @@ -4111,7 +4111,7 @@ yy193: } yy194: YYDEBUG(194, *YYCURSOR); -#line 1624 "ext/date/lib/parse_date.re" +#line 1626 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("monthtext"); TIMELIB_INIT; @@ -4120,7 +4120,7 @@ yy194: TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } -#line 4122 "ext/date/lib/parse_date.c" +#line 4124 "ext/date/lib/parse_date.c" yy195: YYDEBUG(195, *YYCURSOR); ++YYCURSOR; @@ -4171,7 +4171,7 @@ yy198: } yy199: YYDEBUG(199, *YYCURSOR); -#line 1374 "ext/date/lib/parse_date.re" +#line 1376 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("datetextual | datenoyear"); TIMELIB_INIT; @@ -4183,7 +4183,7 @@ yy199: TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } -#line 4185 "ext/date/lib/parse_date.c" +#line 4187 "ext/date/lib/parse_date.c" yy200: YYDEBUG(200, *YYCURSOR); yyaccept = 6; @@ -4452,7 +4452,7 @@ yy222: } yy223: YYDEBUG(223, *YYCURSOR); -#line 1672 "ext/date/lib/parse_date.re" +#line 1674 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz"); @@ -4481,7 +4481,7 @@ yy223: TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } -#line 4483 "ext/date/lib/parse_date.c" +#line 4485 "ext/date/lib/parse_date.c" yy224: YYDEBUG(224, *YYCURSOR); yyaccept = 7; @@ -5179,7 +5179,7 @@ yy278: YYDEBUG(278, *YYCURSOR); ++YYCURSOR; YYDEBUG(279, *YYCURSOR); -#line 1648 "ext/date/lib/parse_date.re" +#line 1650 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12"); TIMELIB_INIT; @@ -5202,7 +5202,7 @@ yy278: TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } -#line 5204 "ext/date/lib/parse_date.c" +#line 5206 "ext/date/lib/parse_date.c" yy280: YYDEBUG(280, *YYCURSOR); yych = *++YYCURSOR; @@ -5380,7 +5380,7 @@ yy294: ++YYCURSOR; yy295: YYDEBUG(295, *YYCURSOR); -#line 1348 "ext/date/lib/parse_date.re" +#line 1350 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("datenoday"); TIMELIB_INIT; @@ -5392,7 +5392,7 @@ yy295: TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } -#line 5394 "ext/date/lib/parse_date.c" +#line 5396 "ext/date/lib/parse_date.c" yy296: YYDEBUG(296, *YYCURSOR); yych = *++YYCURSOR; @@ -6612,7 +6612,7 @@ yy362: if (yych <= '9') goto yy365; yy364: YYDEBUG(364, *YYCURSOR); -#line 1488 "ext/date/lib/parse_date.re" +#line 1490 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("pgtextshort"); TIMELIB_INIT; @@ -6624,7 +6624,7 @@ yy364: TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 6626 "ext/date/lib/parse_date.c" +#line 6628 "ext/date/lib/parse_date.c" yy365: YYDEBUG(365, *YYCURSOR); yych = *++YYCURSOR; @@ -7262,7 +7262,7 @@ yy392: } yy393: YYDEBUG(393, *YYCURSOR); -#line 1544 "ext/date/lib/parse_date.re" +#line 1546 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("ago"); TIMELIB_INIT; @@ -7282,7 +7282,7 @@ yy393: TIMELIB_DEINIT; return TIMELIB_AGO; } -#line 7284 "ext/date/lib/parse_date.c" +#line 7286 "ext/date/lib/parse_date.c" yy394: YYDEBUG(394, *YYCURSOR); yyaccept = 5; @@ -9032,7 +9032,7 @@ yy454: ++YYCURSOR; yy455: YYDEBUG(455, *YYCURSOR); -#line 1258 "ext/date/lib/parse_date.re" +#line 1260 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("iso8601date4 | iso8601date2 | iso8601dateslash | dateslash"); TIMELIB_INIT; @@ -9043,7 +9043,7 @@ yy455: TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 9045 "ext/date/lib/parse_date.c" +#line 9047 "ext/date/lib/parse_date.c" yy456: YYDEBUG(456, *YYCURSOR); yyaccept = 0; @@ -9603,7 +9603,7 @@ yy475: } yy476: YYDEBUG(476, *YYCURSOR); -#line 1387 "ext/date/lib/parse_date.re" +#line 1389 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("datenoyearrev"); TIMELIB_INIT; @@ -9614,7 +9614,7 @@ yy476: TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } -#line 9616 "ext/date/lib/parse_date.c" +#line 9618 "ext/date/lib/parse_date.c" yy477: YYDEBUG(477, *YYCURSOR); yyaccept = 10; @@ -9755,7 +9755,7 @@ yy488: YYDEBUG(488, *YYCURSOR); ++YYCURSOR; YYDEBUG(489, *YYCURSOR); -#line 1114 "ext/date/lib/parse_date.re" +#line 1116 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("timetiny12 | timeshort12 | timelong12"); TIMELIB_INIT; @@ -9771,7 +9771,7 @@ yy488: TIMELIB_DEINIT; return TIMELIB_TIME12; } -#line 9773 "ext/date/lib/parse_date.c" +#line 9775 "ext/date/lib/parse_date.c" yy490: YYDEBUG(490, *YYCURSOR); yyaccept = 11; @@ -9784,7 +9784,7 @@ yy490: } yy491: YYDEBUG(491, *YYCURSOR); -#line 1151 "ext/date/lib/parse_date.re" +#line 1153 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("timeshort24 | timelong24 | iso8601long"); @@ -9809,7 +9809,7 @@ yy491: TIMELIB_DEINIT; return TIMELIB_TIME24_WITH_ZONE; } -#line 9811 "ext/date/lib/parse_date.c" +#line 9813 "ext/date/lib/parse_date.c" yy492: YYDEBUG(492, *YYCURSOR); yyaccept = 11; @@ -10119,7 +10119,7 @@ yy523: YYDEBUG(523, *YYCURSOR); ++YYCURSOR; YYDEBUG(524, *YYCURSOR); -#line 1131 "ext/date/lib/parse_date.re" +#line 1133 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("mssqltime"); TIMELIB_INIT; @@ -10138,7 +10138,7 @@ yy523: TIMELIB_DEINIT; return TIMELIB_TIME24_WITH_ZONE; } -#line 10140 "ext/date/lib/parse_date.c" +#line 10142 "ext/date/lib/parse_date.c" yy525: YYDEBUG(525, *YYCURSOR); yyaccept = 11; @@ -10244,7 +10244,7 @@ yy534: if (yych <= '9') goto yy541; yy535: YYDEBUG(535, *YYCURSOR); -#line 1309 "ext/date/lib/parse_date.re" +#line 1311 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("datefull"); TIMELIB_INIT; @@ -10257,7 +10257,7 @@ yy535: TIMELIB_DEINIT; return TIMELIB_DATE_FULL; } -#line 10259 "ext/date/lib/parse_date.c" +#line 10261 "ext/date/lib/parse_date.c" yy536: YYDEBUG(536, *YYCURSOR); yych = *++YYCURSOR; @@ -10994,7 +10994,7 @@ yy605: YYDEBUG(606, *YYCURSOR); ++YYCURSOR; YYDEBUG(607, *YYCURSOR); -#line 1323 "ext/date/lib/parse_date.re" +#line 1325 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("pointed date YYYY"); TIMELIB_INIT; @@ -11005,7 +11005,7 @@ yy605: TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } -#line 11007 "ext/date/lib/parse_date.c" +#line 11009 "ext/date/lib/parse_date.c" yy608: YYDEBUG(608, *YYCURSOR); yyaccept = 11; @@ -11041,7 +11041,7 @@ yy611: if (yych <= '9') goto yy605; yy612: YYDEBUG(612, *YYCURSOR); -#line 1335 "ext/date/lib/parse_date.re" +#line 1337 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("pointed date YY"); TIMELIB_INIT; @@ -11053,7 +11053,7 @@ yy612: TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } -#line 11055 "ext/date/lib/parse_date.c" +#line 11057 "ext/date/lib/parse_date.c" yy613: YYDEBUG(613, *YYCURSOR); yyaccept = 11; @@ -11694,7 +11694,7 @@ yy656: } yy657: YYDEBUG(657, *YYCURSOR); -#line 1296 "ext/date/lib/parse_date.re" +#line 1298 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("gnudateshort"); TIMELIB_INIT; @@ -11706,7 +11706,7 @@ yy657: TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 11708 "ext/date/lib/parse_date.c" +#line 11710 "ext/date/lib/parse_date.c" yy658: YYDEBUG(658, *YYCURSOR); yyaccept = 13; @@ -11812,7 +11812,7 @@ yy666: } yy667: YYDEBUG(667, *YYCURSOR); -#line 1243 "ext/date/lib/parse_date.re" +#line 1245 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("americanshort | american"); TIMELIB_INIT; @@ -11826,7 +11826,7 @@ yy667: TIMELIB_DEINIT; return TIMELIB_AMERICAN; } -#line 11828 "ext/date/lib/parse_date.c" +#line 11830 "ext/date/lib/parse_date.c" yy668: YYDEBUG(668, *YYCURSOR); yyaccept = 14; @@ -12059,7 +12059,7 @@ yy700: if (yych <= ':') goto yy704; yy701: YYDEBUG(701, *YYCURSOR); -#line 1514 "ext/date/lib/parse_date.re" +#line 1516 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("clf"); @@ -12079,7 +12079,7 @@ yy701: TIMELIB_DEINIT; return TIMELIB_CLF; } -#line 12081 "ext/date/lib/parse_date.c" +#line 12083 "ext/date/lib/parse_date.c" yy702: YYDEBUG(702, *YYCURSOR); yych = *++YYCURSOR; @@ -12631,7 +12631,7 @@ yy763: } yy764: YYDEBUG(764, *YYCURSOR); -#line 1270 "ext/date/lib/parse_date.re" +#line 1272 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("iso8601date2"); TIMELIB_INIT; @@ -12643,7 +12643,7 @@ yy764: TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 12645 "ext/date/lib/parse_date.c" +#line 12647 "ext/date/lib/parse_date.c" yy765: YYDEBUG(765, *YYCURSOR); yych = *++YYCURSOR; @@ -12682,7 +12682,7 @@ yy771: YYDEBUG(771, *YYCURSOR); ++YYCURSOR; YYDEBUG(772, *YYCURSOR); -#line 1501 "ext/date/lib/parse_date.re" +#line 1503 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("pgtextreverse"); TIMELIB_INIT; @@ -12694,7 +12694,7 @@ yy771: TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 12696 "ext/date/lib/parse_date.c" +#line 12698 "ext/date/lib/parse_date.c" yy773: YYDEBUG(773, *YYCURSOR); yych = *++YYCURSOR; @@ -12832,7 +12832,7 @@ yy783: } yy784: YYDEBUG(784, *YYCURSOR); -#line 1535 "ext/date/lib/parse_date.re" +#line 1537 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("year4"); TIMELIB_INIT; @@ -12840,7 +12840,7 @@ yy784: TIMELIB_DEINIT; return TIMELIB_CLF; } -#line 12842 "ext/date/lib/parse_date.c" +#line 12844 "ext/date/lib/parse_date.c" yy785: YYDEBUG(785, *YYCURSOR); yych = *++YYCURSOR; @@ -12991,7 +12991,7 @@ yy793: } yy794: YYDEBUG(794, *YYCURSOR); -#line 1361 "ext/date/lib/parse_date.re" +#line 1363 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("datenodayrev"); TIMELIB_INIT; @@ -13003,7 +13003,7 @@ yy794: TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } -#line 13005 "ext/date/lib/parse_date.c" +#line 13007 "ext/date/lib/parse_date.c" yy795: YYDEBUG(795, *YYCURSOR); yych = *++YYCURSOR; @@ -13218,7 +13218,7 @@ yy814: if (yych <= '7') goto yy817; yy815: YYDEBUG(815, *YYCURSOR); -#line 1469 "ext/date/lib/parse_date.re" +#line 1471 "ext/date/lib/parse_date.re" { timelib_sll w, d; DEBUG_OUTPUT("isoweek"); @@ -13236,7 +13236,7 @@ yy815: TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -#line 13238 "ext/date/lib/parse_date.c" +#line 13240 "ext/date/lib/parse_date.c" yy816: YYDEBUG(816, *YYCURSOR); yych = *++YYCURSOR; @@ -13246,7 +13246,7 @@ yy817: YYDEBUG(817, *YYCURSOR); ++YYCURSOR; YYDEBUG(818, *YYCURSOR); -#line 1450 "ext/date/lib/parse_date.re" +#line 1452 "ext/date/lib/parse_date.re" { timelib_sll w, d; DEBUG_OUTPUT("isoweekday"); @@ -13264,7 +13264,7 @@ yy817: TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -#line 13266 "ext/date/lib/parse_date.c" +#line 13268 "ext/date/lib/parse_date.c" yy819: YYDEBUG(819, *YYCURSOR); yych = *++YYCURSOR; @@ -13328,7 +13328,7 @@ yy821: } yy822: YYDEBUG(822, *YYCURSOR); -#line 1437 "ext/date/lib/parse_date.re" +#line 1439 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("pgydotd"); TIMELIB_INIT; @@ -13340,7 +13340,7 @@ yy822: TIMELIB_DEINIT; return TIMELIB_PG_YEARDAY; } -#line 13342 "ext/date/lib/parse_date.c" +#line 13344 "ext/date/lib/parse_date.c" yy823: YYDEBUG(823, *YYCURSOR); yych = *++YYCURSOR; @@ -13443,7 +13443,7 @@ yy842: ++YYCURSOR; yy843: YYDEBUG(843, *YYCURSOR); -#line 1411 "ext/date/lib/parse_date.re" +#line 1413 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("xmlrpc | xmlrpcnocolon | soap | wddx | exif"); @@ -13468,7 +13468,7 @@ yy843: TIMELIB_DEINIT; return TIMELIB_XMLRPC_SOAP; } -#line 13470 "ext/date/lib/parse_date.c" +#line 13472 "ext/date/lib/parse_date.c" yy844: YYDEBUG(844, *YYCURSOR); yych = *++YYCURSOR; @@ -13730,7 +13730,7 @@ yy848: } yy849: YYDEBUG(849, *YYCURSOR); -#line 1399 "ext/date/lib/parse_date.re" +#line 1401 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("datenocolon"); TIMELIB_INIT; @@ -13741,7 +13741,7 @@ yy849: TIMELIB_DEINIT; return TIMELIB_DATE_NOCOLON; } -#line 13743 "ext/date/lib/parse_date.c" +#line 13745 "ext/date/lib/parse_date.c" yy850: YYDEBUG(850, *YYCURSOR); yych = *++YYCURSOR; @@ -14661,7 +14661,7 @@ yy973: if (yych <= '9') goto yy996; yy974: YYDEBUG(974, *YYCURSOR); -#line 1283 "ext/date/lib/parse_date.re" +#line 1285 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("gnudateshorter"); TIMELIB_INIT; @@ -14673,7 +14673,7 @@ yy974: TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 14675 "ext/date/lib/parse_date.c" +#line 14677 "ext/date/lib/parse_date.c" yy975: YYDEBUG(975, *YYCURSOR); yyaccept = 22; @@ -15682,7 +15682,7 @@ yy1066: } yy1068: YYDEBUG(1068, *YYCURSOR); -#line 1177 "ext/date/lib/parse_date.re" +#line 1179 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("gnunocolon"); TIMELIB_INIT; @@ -15704,7 +15704,7 @@ yy1068: TIMELIB_DEINIT; return TIMELIB_GNU_NOCOLON; } -#line 15706 "ext/date/lib/parse_date.c" +#line 15708 "ext/date/lib/parse_date.c" yy1069: YYDEBUG(1069, *YYCURSOR); yych = *++YYCURSOR; @@ -15796,7 +15796,7 @@ yy1075: } yy1076: YYDEBUG(1076, *YYCURSOR); -#line 1223 "ext/date/lib/parse_date.re" +#line 1225 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("iso8601nocolon"); @@ -15815,7 +15815,7 @@ yy1076: TIMELIB_DEINIT; return TIMELIB_ISO_NOCOLON; } -#line 15817 "ext/date/lib/parse_date.c" +#line 15819 "ext/date/lib/parse_date.c" yy1077: YYDEBUG(1077, *YYCURSOR); yyaccept = 25; @@ -16713,7 +16713,7 @@ yy1117: } yy1118: YYDEBUG(1118, *YYCURSOR); -#line 1607 "ext/date/lib/parse_date.re" +#line 1609 "ext/date/lib/parse_date.re" { timelib_sll i; int behavior = 0; @@ -16729,7 +16729,7 @@ yy1118: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 16731 "ext/date/lib/parse_date.c" +#line 16733 "ext/date/lib/parse_date.c" yy1119: YYDEBUG(1119, *YYCURSOR); ++YYCURSOR; @@ -16780,7 +16780,7 @@ yy1126: YYDEBUG(1126, *YYCURSOR); ++YYCURSOR; YYDEBUG(1127, *YYCURSOR); -#line 1092 "ext/date/lib/parse_date.re" +#line 1094 "ext/date/lib/parse_date.re" { timelib_sll i; int behavior = 0; @@ -16801,7 +16801,7 @@ yy1126: TIMELIB_DEINIT; return TIMELIB_WEEK_DAY_OF_MONTH; } -#line 16803 "ext/date/lib/parse_date.c" +#line 16805 "ext/date/lib/parse_date.c" yy1128: YYDEBUG(1128, *YYCURSOR); yyaccept = 26; @@ -16909,7 +16909,7 @@ yy1141: } yy1142: YYDEBUG(1142, *YYCURSOR); -#line 1583 "ext/date/lib/parse_date.re" +#line 1585 "ext/date/lib/parse_date.re" { timelib_sll i; int behavior = 0; @@ -16932,7 +16932,7 @@ yy1142: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 16934 "ext/date/lib/parse_date.c" +#line 16936 "ext/date/lib/parse_date.c" yy1143: YYDEBUG(1143, *YYCURSOR); yych = *++YYCURSOR; @@ -19609,7 +19609,7 @@ yy1294: goto yy1298; yy1295: YYDEBUG(1295, *YYCURSOR); -#line 1069 "ext/date/lib/parse_date.re" +#line 1071 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("backof | frontof"); TIMELIB_INIT; @@ -19631,7 +19631,7 @@ yy1295: TIMELIB_DEINIT; return TIMELIB_LF_DAY_OF_MONTH; } -#line 19633 "ext/date/lib/parse_date.c" +#line 19635 "ext/date/lib/parse_date.c" yy1296: YYDEBUG(1296, *YYCURSOR); yyaccept = 28; @@ -21322,7 +21322,7 @@ yy1385: if (yych <= '9') goto yy1385; yy1387: YYDEBUG(1387, *YYCURSOR); -#line 1027 "ext/date/lib/parse_date.re" +#line 1029 "ext/date/lib/parse_date.re" { timelib_ull i; @@ -21346,7 +21346,7 @@ yy1387: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 21348 "ext/date/lib/parse_date.c" +#line 21350 "ext/date/lib/parse_date.c" yy1388: YYDEBUG(1388, *YYCURSOR); yych = *++YYCURSOR; @@ -21782,7 +21782,7 @@ yy1416: ++YYCURSOR; yy1417: YYDEBUG(1417, *YYCURSOR); -#line 1015 "ext/date/lib/parse_date.re" +#line 1017 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("tomorrow"); TIMELIB_INIT; @@ -21793,7 +21793,7 @@ yy1417: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 21795 "ext/date/lib/parse_date.c" +#line 21797 "ext/date/lib/parse_date.c" yy1418: YYDEBUG(1418, *YYCURSOR); yych = *++YYCURSOR; @@ -21828,7 +21828,7 @@ yy1419: } yy1420: YYDEBUG(1420, *YYCURSOR); -#line 1005 "ext/date/lib/parse_date.re" +#line 1007 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("midnight | today"); TIMELIB_INIT; @@ -21837,7 +21837,7 @@ yy1420: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 21839 "ext/date/lib/parse_date.c" +#line 21841 "ext/date/lib/parse_date.c" yy1421: YYDEBUG(1421, *YYCURSOR); yych = *++YYCURSOR; @@ -23849,7 +23849,7 @@ yy1499: } yy1500: YYDEBUG(1500, *YYCURSOR); -#line 984 "ext/date/lib/parse_date.re" +#line 986 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("now"); TIMELIB_INIT; @@ -23857,7 +23857,7 @@ yy1500: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 23859 "ext/date/lib/parse_date.c" +#line 23861 "ext/date/lib/parse_date.c" yy1501: YYDEBUG(1501, *YYCURSOR); yych = *++YYCURSOR; @@ -23996,7 +23996,7 @@ yy1507: } yy1508: YYDEBUG(1508, *YYCURSOR); -#line 993 "ext/date/lib/parse_date.re" +#line 995 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("noon"); TIMELIB_INIT; @@ -24007,7 +24007,7 @@ yy1508: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 24009 "ext/date/lib/parse_date.c" +#line 24011 "ext/date/lib/parse_date.c" yy1509: YYDEBUG(1509, *YYCURSOR); yyaccept = 0; @@ -24540,7 +24540,7 @@ yy1530: ++YYCURSOR; yy1531: YYDEBUG(1531, *YYCURSOR); -#line 972 "ext/date/lib/parse_date.re" +#line 974 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("yesterday"); TIMELIB_INIT; @@ -24551,7 +24551,7 @@ yy1531: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 24553 "ext/date/lib/parse_date.c" +#line 24555 "ext/date/lib/parse_date.c" yy1532: YYDEBUG(1532, *YYCURSOR); yyaccept = 0; @@ -24724,7 +24724,7 @@ yy1537: goto yy1531; } } -#line 1733 "ext/date/lib/parse_date.re" +#line 1735 "ext/date/lib/parse_date.re" } @@ -24791,6 +24791,10 @@ timelib_time* timelib_strtotime(char *s, int len, struct timelib_error_container #endif } while(t != EOI); + /* do funky checking whether the parsed time was valid time */ + if (in.time->have_time && !timelib_valid_time( in.time->h, in.time->i, in.time->s)) { + add_warning(&in, "The parsed time was invalid"); + } /* do funky checking whether the parsed date was valid date */ if (in.time->have_date && !timelib_valid_date( in.time->y, in.time->m, in.time->d)) { add_warning(&in, "The parsed date was invalid"); @@ -24986,7 +24990,7 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim break; case '#': /* separation symbol */ - if (*ptr == ';' || *ptr == ':' || *ptr == '/' || *ptr == '.' || *ptr == ',' || *ptr == '-') { + if (*ptr == ';' || *ptr == ':' || *ptr == '/' || *ptr == '.' || *ptr == ',' || *ptr == '-' || *ptr == '(' || *ptr == ')') { ++ptr; } else { add_pbf_error(s, "The separation symbol ([;:/.,-]) could not be found", string, begin); @@ -24999,6 +25003,8 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim case '.': case ',': case '-': + case '(': + case ')': if (*ptr == *fptr) { ++ptr; } else { diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re index 73b3cadf1..4943c36d0 100644 --- a/ext/date/lib/parse_date.re +++ b/ext/date/lib/parse_date.re @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_date.re 301253 2010-07-14 00:04:43Z kalle $ */ +/* $Id: parse_date.re 305316 2010-11-13 15:01:48Z derick $ */ #include "timelib.h" @@ -1798,6 +1798,10 @@ timelib_time* timelib_strtotime(char *s, int len, struct timelib_error_container #endif } while(t != EOI); + /* do funky checking whether the parsed time was valid time */ + if (in.time->have_time && !timelib_valid_time( in.time->h, in.time->i, in.time->s)) { + add_warning(&in, "The parsed time was invalid"); + } /* do funky checking whether the parsed date was valid date */ if (in.time->have_date && !timelib_valid_date( in.time->y, in.time->m, in.time->d)) { add_warning(&in, "The parsed date was invalid"); @@ -1993,7 +1997,7 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim break; case '#': /* separation symbol */ - if (*ptr == ';' || *ptr == ':' || *ptr == '/' || *ptr == '.' || *ptr == ',' || *ptr == '-') { + if (*ptr == ';' || *ptr == ':' || *ptr == '/' || *ptr == '.' || *ptr == ',' || *ptr == '-' || *ptr == '(' || *ptr == ')') { ++ptr; } else { add_pbf_error(s, "The separation symbol ([;:/.,-]) could not be found", string, begin); @@ -2006,6 +2010,8 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim case '.': case ',': case '-': + case '(': + case ')': if (*ptr == *fptr) { ++ptr; } else { diff --git a/ext/date/lib/parse_iso_intervals.c b/ext/date/lib/parse_iso_intervals.c index d1e3a63eb..bb267127e 100644 --- a/ext/date/lib/parse_iso_intervals.c +++ b/ext/date/lib/parse_iso_intervals.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Fri Mar 26 12:12:03 2010 */ +/* Generated by re2c 0.13.5 on Sat Nov 13 14:57:59 2010 */ #line 1 "ext/date/lib/parse_iso_intervals.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_iso_intervals.c 296828 2010-03-26 04:31:26Z aharvey $ */ +/* $Id: parse_iso_intervals.c 305316 2010-11-13 15:01:48Z derick $ */ #include "timelib.h" diff --git a/ext/date/lib/timelib.c b/ext/date/lib/timelib.c index 84001d364..dce223822 100644 --- a/ext/date/lib/timelib.c +++ b/ext/date/lib/timelib.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: timelib.c 293036 2010-01-03 09:23:27Z sebastian $ */ +/* $Id: timelib.c 305315 2010-11-13 14:57:47Z derick $ */ #include "timelib.h" #include <ctype.h> @@ -46,6 +46,19 @@ timelib_rel_time* timelib_rel_time_ctor(void) return t; } +timelib_time* timelib_time_clone(timelib_time *orig) +{ + timelib_time *tmp = timelib_time_ctor(); + memcpy(tmp, orig, sizeof(timelib_time)); + if (orig->tz_abbr) { + tmp->tz_abbr = strdup(orig->tz_abbr); + } + if (orig->tz_info) { + tmp->tz_info = orig->tz_info; + } + return tmp; +} + timelib_rel_time* timelib_rel_time_clone(timelib_rel_time *rel) { timelib_rel_time *tmp = timelib_rel_time_ctor(); @@ -217,8 +230,6 @@ void timelib_dump_date(timelib_time *d, int options) printf(" %05d%s", d->z, d->dst == 1 ? " (DST)" : ""); break; } - } else { - printf(" GMT 00000"); } if ((options & 1) == 1) { diff --git a/ext/date/lib/timelib.h b/ext/date/lib/timelib.h index 33eb6ebd9..b6be12569 100644 --- a/ext/date/lib/timelib.h +++ b/ext/date/lib/timelib.h @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: timelib.h 293036 2010-01-03 09:23:27Z sebastian $ */ +/* $Id: timelib.h 302887 2010-08-30 15:32:09Z derick $ */ #ifndef __TIMELIB_H__ #define __TIMELIB_H__ @@ -109,6 +109,7 @@ timelib_rel_time* timelib_rel_time_clone(timelib_rel_time *tz); timelib_time* timelib_time_ctor(void); void timelib_time_set_option(timelib_time* tm, int option, void* option_value); void timelib_time_dtor(timelib_time* t); +timelib_time* timelib_time_clone(timelib_time* orig); timelib_time_offset* timelib_time_offset_ctor(void); void timelib_time_offset_dtor(timelib_time_offset* t); diff --git a/ext/date/lib/timezonedb.h b/ext/date/lib/timezonedb.h index 6d7ee5910..9156523af 100644 --- a/ext/date/lib/timezonedb.h +++ b/ext/date/lib/timezonedb.h @@ -1,4 +1,4 @@ -const timelib_tzdb_index_entry timezonedb_idx_builtin[565] = { +const timelib_tzdb_index_entry timezonedb_idx_builtin[568] = { { "Africa/Abidjan" , 0x000000 }, { "Africa/Accra" , 0x000055 }, { "Africa/Addis_Ababa" , 0x0000FD }, @@ -13,560 +13,563 @@ const timelib_tzdb_index_entry timezonedb_idx_builtin[565] = { { "Africa/Brazzaville" , 0x00051C }, { "Africa/Bujumbura" , 0x000571 }, { "Africa/Cairo" , 0x0005B5 }, - { "Africa/Casablanca" , 0x00097C }, - { "Africa/Ceuta" , 0x000A62 }, - { "Africa/Conakry" , 0x000D69 }, - { "Africa/Dakar" , 0x000DD4 }, - { "Africa/Dar_es_Salaam" , 0x000E3A }, - { "Africa/Djibouti" , 0x000EA7 }, - { "Africa/Douala" , 0x000EFC }, - { "Africa/El_Aaiun" , 0x000F51 }, - { "Africa/Freetown" , 0x000FB7 }, - { "Africa/Gaborone" , 0x0010C6 }, - { "Africa/Harare" , 0x001121 }, - { "Africa/Johannesburg" , 0x001176 }, - { "Africa/Kampala" , 0x0011E4 }, - { "Africa/Khartoum" , 0x001263 }, - { "Africa/Kigali" , 0x001376 }, - { "Africa/Kinshasa" , 0x0013CB }, - { "Africa/Lagos" , 0x001426 }, - { "Africa/Libreville" , 0x00147B }, - { "Africa/Lome" , 0x0014D0 }, - { "Africa/Luanda" , 0x001514 }, - { "Africa/Lubumbashi" , 0x001569 }, - { "Africa/Lusaka" , 0x0015C4 }, - { "Africa/Malabo" , 0x001619 }, - { "Africa/Maputo" , 0x00167F }, - { "Africa/Maseru" , 0x0016D4 }, - { "Africa/Mbabane" , 0x00173C }, - { "Africa/Mogadishu" , 0x001792 }, - { "Africa/Monrovia" , 0x0017ED }, - { "Africa/Nairobi" , 0x001853 }, - { "Africa/Ndjamena" , 0x0018D2 }, - { "Africa/Niamey" , 0x00193E }, - { "Africa/Nouakchott" , 0x0019B1 }, - { "Africa/Ouagadougou" , 0x001A1C }, - { "Africa/Porto-Novo" , 0x001A71 }, - { "Africa/Sao_Tome" , 0x001AD7 }, - { "Africa/Timbuktu" , 0x001B2C }, - { "Africa/Tripoli" , 0x001B97 }, - { "Africa/Tunis" , 0x001C91 }, - { "Africa/Windhoek" , 0x001DA3 }, - { "America/Adak" , 0x001FEA }, - { "America/Anchorage" , 0x002360 }, - { "America/Anguilla" , 0x0026D4 }, - { "America/Antigua" , 0x002729 }, - { "America/Araguaina" , 0x00278F }, - { "America/Argentina/Buenos_Aires" , 0x0028EA }, - { "America/Argentina/Catamarca" , 0x002A98 }, - { "America/Argentina/ComodRivadavia" , 0x002C59 }, - { "America/Argentina/Cordoba" , 0x002DFF }, - { "America/Argentina/Jujuy" , 0x002FD4 }, - { "America/Argentina/La_Rioja" , 0x003188 }, - { "America/Argentina/Mendoza" , 0x003340 }, - { "America/Argentina/Rio_Gallegos" , 0x003500 }, - { "America/Argentina/Salta" , 0x0036B5 }, - { "America/Argentina/San_Juan" , 0x003861 }, - { "America/Argentina/San_Luis" , 0x003A19 }, - { "America/Argentina/Tucuman" , 0x003BDF }, - { "America/Argentina/Ushuaia" , 0x003D9B }, - { "America/Aruba" , 0x003F56 }, - { "America/Asuncion" , 0x003FBC }, - { "America/Atikokan" , 0x0042A1 }, - { "America/Atka" , 0x004377 }, - { "America/Bahia" , 0x0046DD }, - { "America/Barbados" , 0x004866 }, - { "America/Belem" , 0x004900 }, - { "America/Belize" , 0x0049FB }, - { "America/Blanc-Sablon" , 0x004B77 }, - { "America/Boa_Vista" , 0x004C2B }, - { "America/Bogota" , 0x004D34 }, - { "America/Boise" , 0x004DA0 }, - { "America/Buenos_Aires" , 0x005137 }, - { "America/Cambridge_Bay" , 0x0052D0 }, - { "America/Campo_Grande" , 0x0055F8 }, - { "America/Cancun" , 0x0058E7 }, - { "America/Caracas" , 0x005B29 }, - { "America/Catamarca" , 0x005B90 }, - { "America/Cayenne" , 0x005D36 }, - { "America/Cayman" , 0x005D98 }, - { "America/Chicago" , 0x005DED }, - { "America/Chihuahua" , 0x006304 }, - { "America/Coral_Harbour" , 0x00656F }, - { "America/Cordoba" , 0x006601 }, - { "America/Costa_Rica" , 0x0067A7 }, - { "America/Cuiaba" , 0x006831 }, - { "America/Curacao" , 0x006B0F }, - { "America/Danmarkshavn" , 0x006B75 }, - { "America/Dawson" , 0x006CB9 }, - { "America/Dawson_Creek" , 0x006FD6 }, - { "America/Denver" , 0x0071B0 }, - { "America/Detroit" , 0x007536 }, - { "America/Dominica" , 0x007895 }, - { "America/Edmonton" , 0x0078EA }, - { "America/Eirunepe" , 0x007CA2 }, - { "America/El_Salvador" , 0x007DB5 }, - { "America/Ensenada" , 0x007E2A }, - { "America/Fort_Wayne" , 0x0082D1 }, - { "America/Fortaleza" , 0x008193 }, - { "America/Glace_Bay" , 0x00853B }, - { "America/Godthab" , 0x0088B2 }, - { "America/Goose_Bay" , 0x008B76 }, - { "America/Grand_Turk" , 0x009033 }, - { "America/Grenada" , 0x0092E2 }, - { "America/Guadeloupe" , 0x009337 }, - { "America/Guatemala" , 0x00938C }, - { "America/Guayaquil" , 0x009415 }, - { "America/Guyana" , 0x009472 }, - { "America/Halifax" , 0x0094F3 }, - { "America/Havana" , 0x009A09 }, - { "America/Hermosillo" , 0x009D7C }, - { "America/Indiana/Indianapolis" , 0x009E5A }, - { "America/Indiana/Knox" , 0x00A0EB }, - { "America/Indiana/Marengo" , 0x00A482 }, - { "America/Indiana/Petersburg" , 0x00A728 }, - { "America/Indiana/Tell_City" , 0x00AC75 }, - { "America/Indiana/Vevay" , 0x00AF0E }, - { "America/Indiana/Vincennes" , 0x00B149 }, - { "America/Indiana/Winamac" , 0x00B3FD }, - { "America/Indianapolis" , 0x00AA0B }, - { "America/Inuvik" , 0x00B6B6 }, - { "America/Iqaluit" , 0x00B9AD }, - { "America/Jamaica" , 0x00BCCF }, - { "America/Jujuy" , 0x00BD94 }, - { "America/Juneau" , 0x00BF3E }, - { "America/Kentucky/Louisville" , 0x00C2BC }, - { "America/Kentucky/Monticello" , 0x00C6DA }, - { "America/Knox_IN" , 0x00CA5F }, - { "America/La_Paz" , 0x00CDD0 }, - { "America/Lima" , 0x00CE37 }, - { "America/Los_Angeles" , 0x00CEDF }, - { "America/Louisville" , 0x00D2F0 }, - { "America/Maceio" , 0x00D6E5 }, - { "America/Managua" , 0x00D81F }, - { "America/Manaus" , 0x00D8D2 }, - { "America/Marigot" , 0x00D9D4 }, - { "America/Martinique" , 0x00DA29 }, - { "America/Matamoros" , 0x00DA95 }, - { "America/Mazatlan" , 0x00DCEE }, - { "America/Mendoza" , 0x00DF5B }, - { "America/Menominee" , 0x00E10F }, - { "America/Merida" , 0x00E490 }, - { "America/Mexico_City" , 0x00E6CB }, - { "America/Miquelon" , 0x00E946 }, - { "America/Moncton" , 0x00EBB8 }, - { "America/Monterrey" , 0x00F04F }, - { "America/Montevideo" , 0x00F2B2 }, - { "America/Montreal" , 0x00F5C4 }, - { "America/Montserrat" , 0x00FADA }, - { "America/Nassau" , 0x00FB2F }, - { "America/New_York" , 0x00FE74 }, - { "America/Nipigon" , 0x01037F }, - { "America/Nome" , 0x0106D0 }, - { "America/Noronha" , 0x010A4E }, - { "America/North_Dakota/Center" , 0x010B7E }, - { "America/North_Dakota/New_Salem" , 0x010F12 }, - { "America/Ojinaga" , 0x0112BB }, - { "America/Panama" , 0x01151C }, - { "America/Pangnirtung" , 0x011571 }, - { "America/Paramaribo" , 0x0118A7 }, - { "America/Phoenix" , 0x011939 }, - { "America/Port-au-Prince" , 0x0119E7 }, - { "America/Port_of_Spain" , 0x011C02 }, - { "America/Porto_Acre" , 0x011B03 }, - { "America/Porto_Velho" , 0x011C57 }, - { "America/Puerto_Rico" , 0x011D4D }, - { "America/Rainy_River" , 0x011DB8 }, - { "America/Rankin_Inlet" , 0x0120F0 }, - { "America/Recife" , 0x0123D6 }, - { "America/Regina" , 0x012500 }, - { "America/Resolute" , 0x0126BE }, - { "America/Rio_Branco" , 0x0129B7 }, - { "America/Rosario" , 0x012ABA }, - { "America/Santa_Isabel" , 0x012C60 }, - { "America/Santarem" , 0x013003 }, - { "America/Santiago" , 0x013108 }, - { "America/Santo_Domingo" , 0x0134B1 }, - { "America/Sao_Paulo" , 0x013577 }, - { "America/Scoresbysund" , 0x013886 }, - { "America/Shiprock" , 0x013B74 }, - { "America/St_Barthelemy" , 0x013F03 }, - { "America/St_Johns" , 0x013F58 }, - { "America/St_Kitts" , 0x0144AB }, - { "America/St_Lucia" , 0x014500 }, - { "America/St_Thomas" , 0x014555 }, - { "America/St_Vincent" , 0x0145AA }, - { "America/Swift_Current" , 0x0145FF }, - { "America/Tegucigalpa" , 0x014720 }, - { "America/Thule" , 0x01479F }, - { "America/Thunder_Bay" , 0x0149E6 }, - { "America/Tijuana" , 0x014D2F }, - { "America/Toronto" , 0x0150C8 }, - { "America/Tortola" , 0x0155DF }, - { "America/Vancouver" , 0x015634 }, - { "America/Virgin" , 0x015A71 }, - { "America/Whitehorse" , 0x015AC6 }, - { "America/Winnipeg" , 0x015DE3 }, - { "America/Yakutat" , 0x016223 }, - { "America/Yellowknife" , 0x01658E }, - { "Antarctica/Casey" , 0x01689E }, - { "Antarctica/Davis" , 0x016929 }, - { "Antarctica/DumontDUrville" , 0x0169C0 }, - { "Antarctica/Macquarie" , 0x016A52 }, - { "Antarctica/Mawson" , 0x016CCC }, - { "Antarctica/McMurdo" , 0x016D48 }, - { "Antarctica/Palmer" , 0x01704A }, - { "Antarctica/Rothera" , 0x017366 }, - { "Antarctica/South_Pole" , 0x0173DC }, - { "Antarctica/Syowa" , 0x0176E4 }, - { "Antarctica/Vostok" , 0x017752 }, - { "Arctic/Longyearbyen" , 0x0177C7 }, - { "Asia/Aden" , 0x017AF9 }, - { "Asia/Almaty" , 0x017B4E }, - { "Asia/Amman" , 0x017CCD }, - { "Asia/Anadyr" , 0x017F8D }, - { "Asia/Aqtau" , 0x01827B }, - { "Asia/Aqtobe" , 0x01847A }, - { "Asia/Ashgabat" , 0x018632 }, - { "Asia/Ashkhabad" , 0x01874F }, - { "Asia/Baghdad" , 0x01886C }, - { "Asia/Bahrain" , 0x0189E1 }, - { "Asia/Baku" , 0x018A47 }, - { "Asia/Bangkok" , 0x018D2F }, - { "Asia/Beirut" , 0x018D84 }, - { "Asia/Bishkek" , 0x019091 }, - { "Asia/Brunei" , 0x01923D }, - { "Asia/Calcutta" , 0x01929F }, - { "Asia/Choibalsan" , 0x019318 }, - { "Asia/Chongqing" , 0x019491 }, - { "Asia/Chungking" , 0x019580 }, - { "Asia/Colombo" , 0x01962F }, - { "Asia/Dacca" , 0x0196CB }, - { "Asia/Damascus" , 0x019771 }, - { "Asia/Dhaka" , 0x019AC1 }, - { "Asia/Dili" , 0x019B67 }, - { "Asia/Dubai" , 0x019BF0 }, - { "Asia/Dushanbe" , 0x019C45 }, - { "Asia/Gaza" , 0x019D48 }, - { "Asia/Harbin" , 0x01A091 }, - { "Asia/Ho_Chi_Minh" , 0x01A178 }, - { "Asia/Hong_Kong" , 0x01A1F0 }, - { "Asia/Hovd" , 0x01A3BC }, - { "Asia/Irkutsk" , 0x01A534 }, - { "Asia/Istanbul" , 0x01A81B }, - { "Asia/Jakarta" , 0x01AC08 }, - { "Asia/Jayapura" , 0x01ACB2 }, - { "Asia/Jerusalem" , 0x01AD36 }, - { "Asia/Kabul" , 0x01B065 }, - { "Asia/Kamchatka" , 0x01B0B6 }, - { "Asia/Karachi" , 0x01B39B }, - { "Asia/Kashgar" , 0x01B450 }, - { "Asia/Kathmandu" , 0x01B521 }, - { "Asia/Katmandu" , 0x01B587 }, - { "Asia/Kolkata" , 0x01B5ED }, - { "Asia/Krasnoyarsk" , 0x01B666 }, - { "Asia/Kuala_Lumpur" , 0x01B94F }, - { "Asia/Kuching" , 0x01BA0C }, - { "Asia/Kuwait" , 0x01BAFA }, - { "Asia/Macao" , 0x01BB4F }, - { "Asia/Macau" , 0x01BC8A }, - { "Asia/Magadan" , 0x01BDC5 }, - { "Asia/Makassar" , 0x01C0A8 }, - { "Asia/Manila" , 0x01C161 }, - { "Asia/Muscat" , 0x01C1E6 }, - { "Asia/Nicosia" , 0x01C23B }, - { "Asia/Novokuznetsk" , 0x01C523 }, - { "Asia/Novosibirsk" , 0x01C826 }, - { "Asia/Omsk" , 0x01CB1A }, - { "Asia/Oral" , 0x01CE02 }, - { "Asia/Phnom_Penh" , 0x01CFD2 }, - { "Asia/Pontianak" , 0x01D04A }, - { "Asia/Pyongyang" , 0x01D10B }, - { "Asia/Qatar" , 0x01D178 }, - { "Asia/Qyzylorda" , 0x01D1DE }, - { "Asia/Rangoon" , 0x01D3B4 }, - { "Asia/Riyadh" , 0x01D42C }, - { "Asia/Saigon" , 0x01D481 }, - { "Asia/Sakhalin" , 0x01D4F9 }, - { "Asia/Samarkand" , 0x01D7F9 }, - { "Asia/Seoul" , 0x01D92F }, - { "Asia/Shanghai" , 0x01D9D3 }, - { "Asia/Singapore" , 0x01DAB3 }, - { "Asia/Taipei" , 0x01DB6A }, - { "Asia/Tashkent" , 0x01DC82 }, - { "Asia/Tbilisi" , 0x01DDB3 }, - { "Asia/Tehran" , 0x01DF6D }, - { "Asia/Tel_Aviv" , 0x01E1DB }, - { "Asia/Thimbu" , 0x01E50A }, - { "Asia/Thimphu" , 0x01E570 }, - { "Asia/Tokyo" , 0x01E5D6 }, - { "Asia/Ujung_Pandang" , 0x01E65F }, - { "Asia/Ulaanbaatar" , 0x01E6DB }, - { "Asia/Ulan_Bator" , 0x01E836 }, - { "Asia/Urumqi" , 0x01E983 }, - { "Asia/Vientiane" , 0x01EA4A }, - { "Asia/Vladivostok" , 0x01EAC2 }, - { "Asia/Yakutsk" , 0x01EDAF }, - { "Asia/Yekaterinburg" , 0x01F095 }, - { "Asia/Yerevan" , 0x01F3A1 }, - { "Atlantic/Azores" , 0x01F6A5 }, - { "Atlantic/Bermuda" , 0x01FBA8 }, - { "Atlantic/Canary" , 0x01FE89 }, - { "Atlantic/Cape_Verde" , 0x02015F }, - { "Atlantic/Faeroe" , 0x0201D8 }, - { "Atlantic/Faroe" , 0x02047C }, - { "Atlantic/Jan_Mayen" , 0x020720 }, - { "Atlantic/Madeira" , 0x020A52 }, - { "Atlantic/Reykjavik" , 0x020F5B }, - { "Atlantic/South_Georgia" , 0x021114 }, - { "Atlantic/St_Helena" , 0x02142C }, - { "Atlantic/Stanley" , 0x021158 }, - { "Australia/ACT" , 0x021481 }, - { "Australia/Adelaide" , 0x02179E }, - { "Australia/Brisbane" , 0x021ACA }, - { "Australia/Broken_Hill" , 0x021B91 }, - { "Australia/Canberra" , 0x021ECF }, - { "Australia/Currie" , 0x0221EC }, - { "Australia/Darwin" , 0x02251F }, - { "Australia/Eucla" , 0x0225A5 }, - { "Australia/Hobart" , 0x02267A }, - { "Australia/LHI" , 0x0229D8 }, - { "Australia/Lindeman" , 0x022C73 }, - { "Australia/Lord_Howe" , 0x022D54 }, - { "Australia/Melbourne" , 0x022FFF }, - { "Australia/North" , 0x023324 }, - { "Australia/NSW" , 0x023398 }, - { "Australia/Perth" , 0x0236B5 }, - { "Australia/Queensland" , 0x02378D }, - { "Australia/South" , 0x023839 }, - { "Australia/Sydney" , 0x023B56 }, - { "Australia/Tasmania" , 0x023E93 }, - { "Australia/Victoria" , 0x0241D8 }, - { "Australia/West" , 0x0244F5 }, - { "Australia/Yancowinna" , 0x0245AB }, - { "Brazil/Acre" , 0x0248CD }, - { "Brazil/DeNoronha" , 0x0249CC }, - { "Brazil/East" , 0x024AEC }, - { "Brazil/West" , 0x024DC9 }, - { "Canada/Atlantic" , 0x024EC1 }, - { "Canada/Central" , 0x0253A9 }, - { "Canada/East-Saskatchewan" , 0x025CB3 }, - { "Canada/Eastern" , 0x0257C3 }, - { "Canada/Mountain" , 0x025E3C }, - { "Canada/Newfoundland" , 0x0261B2 }, - { "Canada/Pacific" , 0x0266DD }, - { "Canada/Saskatchewan" , 0x026AF6 }, - { "Canada/Yukon" , 0x026C7F }, - { "CET" , 0x026F82 }, - { "Chile/Continental" , 0x02728B }, - { "Chile/EasterIsland" , 0x027626 }, - { "CST6CDT" , 0x027968 }, - { "Cuba" , 0x027CB9 }, - { "EET" , 0x02802C }, - { "Egypt" , 0x0282DF }, - { "Eire" , 0x0286A6 }, - { "EST" , 0x028BB7 }, - { "EST5EDT" , 0x028BFB }, - { "Etc/GMT" , 0x028F4C }, - { "Etc/GMT+0" , 0x029018 }, - { "Etc/GMT+1" , 0x0290A2 }, - { "Etc/GMT+10" , 0x02912F }, - { "Etc/GMT+11" , 0x0291BD }, - { "Etc/GMT+12" , 0x02924B }, - { "Etc/GMT+2" , 0x029366 }, - { "Etc/GMT+3" , 0x0293F2 }, - { "Etc/GMT+4" , 0x02947E }, - { "Etc/GMT+5" , 0x02950A }, - { "Etc/GMT+6" , 0x029596 }, - { "Etc/GMT+7" , 0x029622 }, - { "Etc/GMT+8" , 0x0296AE }, - { "Etc/GMT+9" , 0x02973A }, - { "Etc/GMT-0" , 0x028FD4 }, - { "Etc/GMT-1" , 0x02905C }, - { "Etc/GMT-10" , 0x0290E8 }, - { "Etc/GMT-11" , 0x029176 }, - { "Etc/GMT-12" , 0x029204 }, - { "Etc/GMT-13" , 0x029292 }, - { "Etc/GMT-14" , 0x0292D9 }, - { "Etc/GMT-2" , 0x029320 }, - { "Etc/GMT-3" , 0x0293AC }, - { "Etc/GMT-4" , 0x029438 }, - { "Etc/GMT-5" , 0x0294C4 }, - { "Etc/GMT-6" , 0x029550 }, - { "Etc/GMT-7" , 0x0295DC }, - { "Etc/GMT-8" , 0x029668 }, - { "Etc/GMT-9" , 0x0296F4 }, - { "Etc/GMT0" , 0x028F90 }, - { "Etc/Greenwich" , 0x029780 }, - { "Etc/UCT" , 0x0297C4 }, - { "Etc/Universal" , 0x029808 }, - { "Etc/UTC" , 0x02984C }, - { "Etc/Zulu" , 0x029890 }, - { "Europe/Amsterdam" , 0x0298D4 }, - { "Europe/Andorra" , 0x029D12 }, - { "Europe/Athens" , 0x029F8E }, - { "Europe/Belfast" , 0x02A2D1 }, - { "Europe/Belgrade" , 0x02A808 }, - { "Europe/Berlin" , 0x02AAD1 }, - { "Europe/Bratislava" , 0x02AE27 }, - { "Europe/Brussels" , 0x02B159 }, - { "Europe/Bucharest" , 0x02B590 }, - { "Europe/Budapest" , 0x02B8BA }, - { "Europe/Chisinau" , 0x02BC2D }, - { "Europe/Copenhagen" , 0x02BFBB }, - { "Europe/Dublin" , 0x02C2C5 }, - { "Europe/Gibraltar" , 0x02C7D6 }, - { "Europe/Guernsey" , 0x02CC2D }, - { "Europe/Helsinki" , 0x02D164 }, - { "Europe/Isle_of_Man" , 0x02D41A }, - { "Europe/Istanbul" , 0x02D951 }, - { "Europe/Jersey" , 0x02DD3E }, - { "Europe/Kaliningrad" , 0x02E275 }, - { "Europe/Kiev" , 0x02E5D8 }, - { "Europe/Lisbon" , 0x02E8EF }, - { "Europe/Ljubljana" , 0x02EDF3 }, - { "Europe/London" , 0x02F0BC }, - { "Europe/Luxembourg" , 0x02F5F3 }, - { "Europe/Madrid" , 0x02FA49 }, - { "Europe/Malta" , 0x02FE0F }, - { "Europe/Mariehamn" , 0x0301C8 }, - { "Europe/Minsk" , 0x03047E }, - { "Europe/Monaco" , 0x030789 }, - { "Europe/Moscow" , 0x030BC4 }, - { "Europe/Nicosia" , 0x030F16 }, - { "Europe/Oslo" , 0x0311FE }, - { "Europe/Paris" , 0x031530 }, - { "Europe/Podgorica" , 0x031976 }, - { "Europe/Prague" , 0x031C3F }, - { "Europe/Riga" , 0x031F71 }, - { "Europe/Rome" , 0x0322B6 }, - { "Europe/Samara" , 0x032679 }, - { "Europe/San_Marino" , 0x0329B2 }, - { "Europe/Sarajevo" , 0x032D75 }, - { "Europe/Simferopol" , 0x03303E }, - { "Europe/Skopje" , 0x033369 }, - { "Europe/Sofia" , 0x033632 }, - { "Europe/Stockholm" , 0x03393A }, - { "Europe/Tallinn" , 0x033BE9 }, - { "Europe/Tirane" , 0x033F23 }, - { "Europe/Tiraspol" , 0x034229 }, - { "Europe/Uzhgorod" , 0x0345B7 }, - { "Europe/Vaduz" , 0x0348CE }, - { "Europe/Vatican" , 0x034B61 }, - { "Europe/Vienna" , 0x034F24 }, - { "Europe/Vilnius" , 0x035251 }, - { "Europe/Volgograd" , 0x035590 }, - { "Europe/Warsaw" , 0x035899 }, - { "Europe/Zagreb" , 0x035C7A }, - { "Europe/Zaporozhye" , 0x035F43 }, - { "Europe/Zurich" , 0x036284 }, - { "Factory" , 0x036533 }, - { "GB" , 0x0365A4 }, - { "GB-Eire" , 0x036ADB }, - { "GMT" , 0x037012 }, - { "GMT+0" , 0x0370DE }, - { "GMT-0" , 0x03709A }, - { "GMT0" , 0x037056 }, - { "Greenwich" , 0x037122 }, - { "Hongkong" , 0x037166 }, - { "HST" , 0x037332 }, - { "Iceland" , 0x037376 }, - { "Indian/Antananarivo" , 0x03752F }, - { "Indian/Chagos" , 0x0375A3 }, - { "Indian/Christmas" , 0x037605 }, - { "Indian/Cocos" , 0x037649 }, - { "Indian/Comoro" , 0x03768D }, - { "Indian/Kerguelen" , 0x0376E2 }, - { "Indian/Mahe" , 0x037737 }, - { "Indian/Maldives" , 0x03778C }, - { "Indian/Mauritius" , 0x0377E1 }, - { "Indian/Mayotte" , 0x037857 }, - { "Indian/Reunion" , 0x0378AC }, - { "Iran" , 0x037901 }, - { "Israel" , 0x037B6F }, - { "Jamaica" , 0x037E9E }, - { "Japan" , 0x037F63 }, - { "Kwajalein" , 0x037FEC }, - { "Libya" , 0x03804F }, - { "MET" , 0x038149 }, - { "Mexico/BajaNorte" , 0x038452 }, - { "Mexico/BajaSur" , 0x0387BB }, - { "Mexico/General" , 0x038A00 }, - { "MST" , 0x038C5E }, - { "MST7MDT" , 0x038CA2 }, - { "Navajo" , 0x038FF3 }, - { "NZ" , 0x03936C }, - { "NZ-CHAT" , 0x0396EA }, - { "Pacific/Apia" , 0x0399D2 }, - { "Pacific/Auckland" , 0x039A50 }, - { "Pacific/Chatham" , 0x039DDC }, - { "Pacific/Easter" , 0x03A0D3 }, - { "Pacific/Efate" , 0x03A431 }, - { "Pacific/Enderbury" , 0x03A4F7 }, - { "Pacific/Fakaofo" , 0x03A565 }, - { "Pacific/Fiji" , 0x03A5A9 }, - { "Pacific/Funafuti" , 0x03A633 }, - { "Pacific/Galapagos" , 0x03A677 }, - { "Pacific/Gambier" , 0x03A6EF }, - { "Pacific/Guadalcanal" , 0x03A754 }, - { "Pacific/Guam" , 0x03A7A9 }, - { "Pacific/Honolulu" , 0x03A7FF }, - { "Pacific/Johnston" , 0x03A893 }, - { "Pacific/Kiritimati" , 0x03A8E5 }, - { "Pacific/Kosrae" , 0x03A950 }, - { "Pacific/Kwajalein" , 0x03A9AD }, - { "Pacific/Majuro" , 0x03AA19 }, - { "Pacific/Marquesas" , 0x03AA78 }, - { "Pacific/Midway" , 0x03AADF }, - { "Pacific/Nauru" , 0x03AB69 }, - { "Pacific/Niue" , 0x03ABE1 }, - { "Pacific/Norfolk" , 0x03AC3F }, - { "Pacific/Noumea" , 0x03AC94 }, - { "Pacific/Pago_Pago" , 0x03AD24 }, - { "Pacific/Palau" , 0x03ADAD }, - { "Pacific/Pitcairn" , 0x03ADF1 }, - { "Pacific/Ponape" , 0x03AE46 }, - { "Pacific/Port_Moresby" , 0x03AE9B }, - { "Pacific/Rarotonga" , 0x03AEDF }, - { "Pacific/Saipan" , 0x03AFBB }, - { "Pacific/Samoa" , 0x03B01E }, - { "Pacific/Tahiti" , 0x03B0A7 }, - { "Pacific/Tarawa" , 0x03B10C }, - { "Pacific/Tongatapu" , 0x03B160 }, - { "Pacific/Truk" , 0x03B1EC }, - { "Pacific/Wake" , 0x03B245 }, - { "Pacific/Wallis" , 0x03B295 }, - { "Pacific/Yap" , 0x03B2D9 }, - { "Poland" , 0x03B31E }, - { "Portugal" , 0x03B6FF }, - { "PRC" , 0x03BBFB }, - { "PST8PDT" , 0x03BCAC }, - { "ROC" , 0x03BFFD }, - { "ROK" , 0x03C115 }, - { "Singapore" , 0x03C1B9 }, - { "Turkey" , 0x03C270 }, - { "UCT" , 0x03C65D }, - { "Universal" , 0x03C6A1 }, - { "US/Alaska" , 0x03C6E5 }, - { "US/Aleutian" , 0x03CA4E }, - { "US/Arizona" , 0x03CDB4 }, - { "US/Central" , 0x03CE42 }, - { "US/East-Indiana" , 0x03D84C }, - { "US/Eastern" , 0x03D34D }, - { "US/Hawaii" , 0x03DAB6 }, - { "US/Indiana-Starke" , 0x03DB44 }, - { "US/Michigan" , 0x03DEB5 }, - { "US/Mountain" , 0x03E1EC }, - { "US/Pacific" , 0x03E565 }, - { "US/Pacific-New" , 0x03E96A }, - { "US/Samoa" , 0x03ED6F }, - { "UTC" , 0x03EDF8 }, - { "W-SU" , 0x03F0EF }, - { "WET" , 0x03EE3C }, - { "Zulu" , 0x03F42A }, + { "Africa/Casablanca" , 0x000986 }, + { "Africa/Ceuta" , 0x000A6C }, + { "Africa/Conakry" , 0x000D73 }, + { "Africa/Dakar" , 0x000DDE }, + { "Africa/Dar_es_Salaam" , 0x000E44 }, + { "Africa/Djibouti" , 0x000EB1 }, + { "Africa/Douala" , 0x000F06 }, + { "Africa/El_Aaiun" , 0x000F5B }, + { "Africa/Freetown" , 0x000FC1 }, + { "Africa/Gaborone" , 0x0010D0 }, + { "Africa/Harare" , 0x00112B }, + { "Africa/Johannesburg" , 0x001180 }, + { "Africa/Kampala" , 0x0011EE }, + { "Africa/Khartoum" , 0x00126D }, + { "Africa/Kigali" , 0x001380 }, + { "Africa/Kinshasa" , 0x0013D5 }, + { "Africa/Lagos" , 0x001430 }, + { "Africa/Libreville" , 0x001485 }, + { "Africa/Lome" , 0x0014DA }, + { "Africa/Luanda" , 0x00151E }, + { "Africa/Lubumbashi" , 0x001573 }, + { "Africa/Lusaka" , 0x0015CE }, + { "Africa/Malabo" , 0x001623 }, + { "Africa/Maputo" , 0x001689 }, + { "Africa/Maseru" , 0x0016DE }, + { "Africa/Mbabane" , 0x001746 }, + { "Africa/Mogadishu" , 0x00179C }, + { "Africa/Monrovia" , 0x0017F7 }, + { "Africa/Nairobi" , 0x00185D }, + { "Africa/Ndjamena" , 0x0018DC }, + { "Africa/Niamey" , 0x001948 }, + { "Africa/Nouakchott" , 0x0019BB }, + { "Africa/Ouagadougou" , 0x001A26 }, + { "Africa/Porto-Novo" , 0x001A7B }, + { "Africa/Sao_Tome" , 0x001AE1 }, + { "Africa/Timbuktu" , 0x001B36 }, + { "Africa/Tripoli" , 0x001BA1 }, + { "Africa/Tunis" , 0x001C9B }, + { "Africa/Windhoek" , 0x001DAD }, + { "America/Adak" , 0x001FF4 }, + { "America/Anchorage" , 0x00236A }, + { "America/Anguilla" , 0x0026DE }, + { "America/Antigua" , 0x002733 }, + { "America/Araguaina" , 0x002799 }, + { "America/Argentina/Buenos_Aires" , 0x0028F4 }, + { "America/Argentina/Catamarca" , 0x002AA2 }, + { "America/Argentina/ComodRivadavia" , 0x002C63 }, + { "America/Argentina/Cordoba" , 0x002E09 }, + { "America/Argentina/Jujuy" , 0x002FDE }, + { "America/Argentina/La_Rioja" , 0x003192 }, + { "America/Argentina/Mendoza" , 0x00334A }, + { "America/Argentina/Rio_Gallegos" , 0x00350A }, + { "America/Argentina/Salta" , 0x0036BF }, + { "America/Argentina/San_Juan" , 0x00386B }, + { "America/Argentina/San_Luis" , 0x003A23 }, + { "America/Argentina/Tucuman" , 0x003BE9 }, + { "America/Argentina/Ushuaia" , 0x003DA5 }, + { "America/Aruba" , 0x003F60 }, + { "America/Asuncion" , 0x003FC6 }, + { "America/Atikokan" , 0x0042AB }, + { "America/Atka" , 0x004381 }, + { "America/Bahia" , 0x0046E7 }, + { "America/Bahia_Banderas" , 0x004870 }, + { "America/Barbados" , 0x004AE9 }, + { "America/Belem" , 0x004B83 }, + { "America/Belize" , 0x004C7E }, + { "America/Blanc-Sablon" , 0x004DFA }, + { "America/Boa_Vista" , 0x004EAE }, + { "America/Bogota" , 0x004FB7 }, + { "America/Boise" , 0x005023 }, + { "America/Buenos_Aires" , 0x0053BA }, + { "America/Cambridge_Bay" , 0x005553 }, + { "America/Campo_Grande" , 0x00587B }, + { "America/Cancun" , 0x005B6A }, + { "America/Caracas" , 0x005DAC }, + { "America/Catamarca" , 0x005E13 }, + { "America/Cayenne" , 0x005FB9 }, + { "America/Cayman" , 0x00601B }, + { "America/Chicago" , 0x006070 }, + { "America/Chihuahua" , 0x006587 }, + { "America/Coral_Harbour" , 0x0067F2 }, + { "America/Cordoba" , 0x006884 }, + { "America/Costa_Rica" , 0x006A2A }, + { "America/Cuiaba" , 0x006AB4 }, + { "America/Curacao" , 0x006D92 }, + { "America/Danmarkshavn" , 0x006DF8 }, + { "America/Dawson" , 0x006F3C }, + { "America/Dawson_Creek" , 0x007259 }, + { "America/Denver" , 0x007433 }, + { "America/Detroit" , 0x0077B9 }, + { "America/Dominica" , 0x007B18 }, + { "America/Edmonton" , 0x007B6D }, + { "America/Eirunepe" , 0x007F25 }, + { "America/El_Salvador" , 0x008038 }, + { "America/Ensenada" , 0x0080AD }, + { "America/Fort_Wayne" , 0x008554 }, + { "America/Fortaleza" , 0x008416 }, + { "America/Glace_Bay" , 0x0087BE }, + { "America/Godthab" , 0x008B35 }, + { "America/Goose_Bay" , 0x008DF9 }, + { "America/Grand_Turk" , 0x0092B6 }, + { "America/Grenada" , 0x009565 }, + { "America/Guadeloupe" , 0x0095BA }, + { "America/Guatemala" , 0x00960F }, + { "America/Guayaquil" , 0x009698 }, + { "America/Guyana" , 0x0096F5 }, + { "America/Halifax" , 0x009776 }, + { "America/Havana" , 0x009C8C }, + { "America/Hermosillo" , 0x009FFF }, + { "America/Indiana/Indianapolis" , 0x00A0DD }, + { "America/Indiana/Knox" , 0x00A36E }, + { "America/Indiana/Marengo" , 0x00A705 }, + { "America/Indiana/Petersburg" , 0x00A9AB }, + { "America/Indiana/Tell_City" , 0x00AEF8 }, + { "America/Indiana/Vevay" , 0x00B191 }, + { "America/Indiana/Vincennes" , 0x00B3CC }, + { "America/Indiana/Winamac" , 0x00B680 }, + { "America/Indianapolis" , 0x00AC8E }, + { "America/Inuvik" , 0x00B939 }, + { "America/Iqaluit" , 0x00BC30 }, + { "America/Jamaica" , 0x00BF52 }, + { "America/Jujuy" , 0x00C017 }, + { "America/Juneau" , 0x00C1C1 }, + { "America/Kentucky/Louisville" , 0x00C53F }, + { "America/Kentucky/Monticello" , 0x00C95D }, + { "America/Knox_IN" , 0x00CCE2 }, + { "America/La_Paz" , 0x00D053 }, + { "America/Lima" , 0x00D0BA }, + { "America/Los_Angeles" , 0x00D162 }, + { "America/Louisville" , 0x00D573 }, + { "America/Maceio" , 0x00D968 }, + { "America/Managua" , 0x00DAA2 }, + { "America/Manaus" , 0x00DB55 }, + { "America/Marigot" , 0x00DC57 }, + { "America/Martinique" , 0x00DCAC }, + { "America/Matamoros" , 0x00DD18 }, + { "America/Mazatlan" , 0x00DF71 }, + { "America/Mendoza" , 0x00E1DE }, + { "America/Menominee" , 0x00E392 }, + { "America/Merida" , 0x00E713 }, + { "America/Mexico_City" , 0x00E94E }, + { "America/Miquelon" , 0x00EBC9 }, + { "America/Moncton" , 0x00EE3B }, + { "America/Monterrey" , 0x00F2D2 }, + { "America/Montevideo" , 0x00F535 }, + { "America/Montreal" , 0x00F847 }, + { "America/Montserrat" , 0x00FD5D }, + { "America/Nassau" , 0x00FDB2 }, + { "America/New_York" , 0x0100F7 }, + { "America/Nipigon" , 0x010602 }, + { "America/Nome" , 0x010953 }, + { "America/Noronha" , 0x010CD1 }, + { "America/North_Dakota/Center" , 0x010E01 }, + { "America/North_Dakota/New_Salem" , 0x011195 }, + { "America/Ojinaga" , 0x01153E }, + { "America/Panama" , 0x01179F }, + { "America/Pangnirtung" , 0x0117F4 }, + { "America/Paramaribo" , 0x011B2A }, + { "America/Phoenix" , 0x011BBC }, + { "America/Port-au-Prince" , 0x011C6A }, + { "America/Port_of_Spain" , 0x011E85 }, + { "America/Porto_Acre" , 0x011D86 }, + { "America/Porto_Velho" , 0x011EDA }, + { "America/Puerto_Rico" , 0x011FD0 }, + { "America/Rainy_River" , 0x01203B }, + { "America/Rankin_Inlet" , 0x012373 }, + { "America/Recife" , 0x012659 }, + { "America/Regina" , 0x012783 }, + { "America/Resolute" , 0x012941 }, + { "America/Rio_Branco" , 0x012C3A }, + { "America/Rosario" , 0x012D3D }, + { "America/Santa_Isabel" , 0x012EE3 }, + { "America/Santarem" , 0x013286 }, + { "America/Santiago" , 0x01338B }, + { "America/Santo_Domingo" , 0x013734 }, + { "America/Sao_Paulo" , 0x0137FA }, + { "America/Scoresbysund" , 0x013B09 }, + { "America/Shiprock" , 0x013DF7 }, + { "America/St_Barthelemy" , 0x014186 }, + { "America/St_Johns" , 0x0141DB }, + { "America/St_Kitts" , 0x01472E }, + { "America/St_Lucia" , 0x014783 }, + { "America/St_Thomas" , 0x0147D8 }, + { "America/St_Vincent" , 0x01482D }, + { "America/Swift_Current" , 0x014882 }, + { "America/Tegucigalpa" , 0x0149A3 }, + { "America/Thule" , 0x014A22 }, + { "America/Thunder_Bay" , 0x014C69 }, + { "America/Tijuana" , 0x014FB2 }, + { "America/Toronto" , 0x01534B }, + { "America/Tortola" , 0x015862 }, + { "America/Vancouver" , 0x0158B7 }, + { "America/Virgin" , 0x015CF4 }, + { "America/Whitehorse" , 0x015D49 }, + { "America/Winnipeg" , 0x016066 }, + { "America/Yakutat" , 0x0164A6 }, + { "America/Yellowknife" , 0x016811 }, + { "Antarctica/Casey" , 0x016B21 }, + { "Antarctica/Davis" , 0x016BAC }, + { "Antarctica/DumontDUrville" , 0x016C43 }, + { "Antarctica/Macquarie" , 0x016CD5 }, + { "Antarctica/Mawson" , 0x016F4F }, + { "Antarctica/McMurdo" , 0x016FCB }, + { "Antarctica/Palmer" , 0x0172CD }, + { "Antarctica/Rothera" , 0x0175E9 }, + { "Antarctica/South_Pole" , 0x01765F }, + { "Antarctica/Syowa" , 0x017967 }, + { "Antarctica/Vostok" , 0x0179D5 }, + { "Arctic/Longyearbyen" , 0x017A46 }, + { "Asia/Aden" , 0x017D78 }, + { "Asia/Almaty" , 0x017DCD }, + { "Asia/Amman" , 0x017F4C }, + { "Asia/Anadyr" , 0x01820C }, + { "Asia/Aqtau" , 0x0184FA }, + { "Asia/Aqtobe" , 0x0186F9 }, + { "Asia/Ashgabat" , 0x0188B1 }, + { "Asia/Ashkhabad" , 0x0189CE }, + { "Asia/Baghdad" , 0x018AEB }, + { "Asia/Bahrain" , 0x018C60 }, + { "Asia/Baku" , 0x018CC6 }, + { "Asia/Bangkok" , 0x018FAE }, + { "Asia/Beirut" , 0x019003 }, + { "Asia/Bishkek" , 0x019310 }, + { "Asia/Brunei" , 0x0194BC }, + { "Asia/Calcutta" , 0x01951E }, + { "Asia/Choibalsan" , 0x019597 }, + { "Asia/Chongqing" , 0x019710 }, + { "Asia/Chungking" , 0x0197FF }, + { "Asia/Colombo" , 0x0198AE }, + { "Asia/Dacca" , 0x01994A }, + { "Asia/Damascus" , 0x0199F0 }, + { "Asia/Dhaka" , 0x019D40 }, + { "Asia/Dili" , 0x019DE6 }, + { "Asia/Dubai" , 0x019E6F }, + { "Asia/Dushanbe" , 0x019EC4 }, + { "Asia/Gaza" , 0x019FC7 }, + { "Asia/Harbin" , 0x01A310 }, + { "Asia/Ho_Chi_Minh" , 0x01A3F7 }, + { "Asia/Hong_Kong" , 0x01A46F }, + { "Asia/Hovd" , 0x01A631 }, + { "Asia/Irkutsk" , 0x01A7A9 }, + { "Asia/Istanbul" , 0x01AA90 }, + { "Asia/Jakarta" , 0x01AE7D }, + { "Asia/Jayapura" , 0x01AF27 }, + { "Asia/Jerusalem" , 0x01AFAB }, + { "Asia/Kabul" , 0x01B2DA }, + { "Asia/Kamchatka" , 0x01B32B }, + { "Asia/Karachi" , 0x01B610 }, + { "Asia/Kashgar" , 0x01B6C5 }, + { "Asia/Kathmandu" , 0x01B796 }, + { "Asia/Katmandu" , 0x01B7FC }, + { "Asia/Kolkata" , 0x01B862 }, + { "Asia/Krasnoyarsk" , 0x01B8DB }, + { "Asia/Kuala_Lumpur" , 0x01BBC4 }, + { "Asia/Kuching" , 0x01BC81 }, + { "Asia/Kuwait" , 0x01BD6F }, + { "Asia/Macao" , 0x01BDC4 }, + { "Asia/Macau" , 0x01BEFF }, + { "Asia/Magadan" , 0x01C03A }, + { "Asia/Makassar" , 0x01C31D }, + { "Asia/Manila" , 0x01C3D6 }, + { "Asia/Muscat" , 0x01C45B }, + { "Asia/Nicosia" , 0x01C4B0 }, + { "Asia/Novokuznetsk" , 0x01C798 }, + { "Asia/Novosibirsk" , 0x01CA9B }, + { "Asia/Omsk" , 0x01CD8F }, + { "Asia/Oral" , 0x01D077 }, + { "Asia/Phnom_Penh" , 0x01D247 }, + { "Asia/Pontianak" , 0x01D2BF }, + { "Asia/Pyongyang" , 0x01D380 }, + { "Asia/Qatar" , 0x01D3ED }, + { "Asia/Qyzylorda" , 0x01D453 }, + { "Asia/Rangoon" , 0x01D629 }, + { "Asia/Riyadh" , 0x01D6A1 }, + { "Asia/Saigon" , 0x01D6F6 }, + { "Asia/Sakhalin" , 0x01D76E }, + { "Asia/Samarkand" , 0x01DA6E }, + { "Asia/Seoul" , 0x01DBA4 }, + { "Asia/Shanghai" , 0x01DC48 }, + { "Asia/Singapore" , 0x01DD28 }, + { "Asia/Taipei" , 0x01DDDF }, + { "Asia/Tashkent" , 0x01DEF7 }, + { "Asia/Tbilisi" , 0x01E028 }, + { "Asia/Tehran" , 0x01E1E2 }, + { "Asia/Tel_Aviv" , 0x01E450 }, + { "Asia/Thimbu" , 0x01E77F }, + { "Asia/Thimphu" , 0x01E7E5 }, + { "Asia/Tokyo" , 0x01E84B }, + { "Asia/Ujung_Pandang" , 0x01E8D4 }, + { "Asia/Ulaanbaatar" , 0x01E950 }, + { "Asia/Ulan_Bator" , 0x01EAAB }, + { "Asia/Urumqi" , 0x01EBF8 }, + { "Asia/Vientiane" , 0x01ECBF }, + { "Asia/Vladivostok" , 0x01ED37 }, + { "Asia/Yakutsk" , 0x01F024 }, + { "Asia/Yekaterinburg" , 0x01F30A }, + { "Asia/Yerevan" , 0x01F616 }, + { "Atlantic/Azores" , 0x01F91A }, + { "Atlantic/Bermuda" , 0x01FE1D }, + { "Atlantic/Canary" , 0x0200FE }, + { "Atlantic/Cape_Verde" , 0x0203D4 }, + { "Atlantic/Faeroe" , 0x02044D }, + { "Atlantic/Faroe" , 0x0206F1 }, + { "Atlantic/Jan_Mayen" , 0x020995 }, + { "Atlantic/Madeira" , 0x020CC7 }, + { "Atlantic/Reykjavik" , 0x0211D0 }, + { "Atlantic/South_Georgia" , 0x021389 }, + { "Atlantic/St_Helena" , 0x0216A1 }, + { "Atlantic/Stanley" , 0x0213CD }, + { "Australia/ACT" , 0x0216F6 }, + { "Australia/Adelaide" , 0x021A13 }, + { "Australia/Brisbane" , 0x021D3F }, + { "Australia/Broken_Hill" , 0x021E06 }, + { "Australia/Canberra" , 0x022144 }, + { "Australia/Currie" , 0x022461 }, + { "Australia/Darwin" , 0x022794 }, + { "Australia/Eucla" , 0x02281A }, + { "Australia/Hobart" , 0x0228EF }, + { "Australia/LHI" , 0x022C4D }, + { "Australia/Lindeman" , 0x022EE8 }, + { "Australia/Lord_Howe" , 0x022FC9 }, + { "Australia/Melbourne" , 0x023274 }, + { "Australia/North" , 0x023599 }, + { "Australia/NSW" , 0x02360D }, + { "Australia/Perth" , 0x02392A }, + { "Australia/Queensland" , 0x023A02 }, + { "Australia/South" , 0x023AAE }, + { "Australia/Sydney" , 0x023DCB }, + { "Australia/Tasmania" , 0x024108 }, + { "Australia/Victoria" , 0x02444D }, + { "Australia/West" , 0x02476A }, + { "Australia/Yancowinna" , 0x024820 }, + { "Brazil/Acre" , 0x024B42 }, + { "Brazil/DeNoronha" , 0x024C41 }, + { "Brazil/East" , 0x024D61 }, + { "Brazil/West" , 0x02503E }, + { "Canada/Atlantic" , 0x025136 }, + { "Canada/Central" , 0x02561E }, + { "Canada/East-Saskatchewan" , 0x025F28 }, + { "Canada/Eastern" , 0x025A38 }, + { "Canada/Mountain" , 0x0260B1 }, + { "Canada/Newfoundland" , 0x026427 }, + { "Canada/Pacific" , 0x026952 }, + { "Canada/Saskatchewan" , 0x026D6B }, + { "Canada/Yukon" , 0x026EF4 }, + { "CET" , 0x0271F7 }, + { "Chile/Continental" , 0x027500 }, + { "Chile/EasterIsland" , 0x02789B }, + { "CST6CDT" , 0x027BDD }, + { "Cuba" , 0x027F2E }, + { "EET" , 0x0282A1 }, + { "Egypt" , 0x028554 }, + { "Eire" , 0x028925 }, + { "EST" , 0x028E36 }, + { "EST5EDT" , 0x028E7A }, + { "Etc/GMT" , 0x0291CB }, + { "Etc/GMT+0" , 0x029297 }, + { "Etc/GMT+1" , 0x029321 }, + { "Etc/GMT+10" , 0x0293AE }, + { "Etc/GMT+11" , 0x02943C }, + { "Etc/GMT+12" , 0x0294CA }, + { "Etc/GMT+2" , 0x0295E5 }, + { "Etc/GMT+3" , 0x029671 }, + { "Etc/GMT+4" , 0x0296FD }, + { "Etc/GMT+5" , 0x029789 }, + { "Etc/GMT+6" , 0x029815 }, + { "Etc/GMT+7" , 0x0298A1 }, + { "Etc/GMT+8" , 0x02992D }, + { "Etc/GMT+9" , 0x0299B9 }, + { "Etc/GMT-0" , 0x029253 }, + { "Etc/GMT-1" , 0x0292DB }, + { "Etc/GMT-10" , 0x029367 }, + { "Etc/GMT-11" , 0x0293F5 }, + { "Etc/GMT-12" , 0x029483 }, + { "Etc/GMT-13" , 0x029511 }, + { "Etc/GMT-14" , 0x029558 }, + { "Etc/GMT-2" , 0x02959F }, + { "Etc/GMT-3" , 0x02962B }, + { "Etc/GMT-4" , 0x0296B7 }, + { "Etc/GMT-5" , 0x029743 }, + { "Etc/GMT-6" , 0x0297CF }, + { "Etc/GMT-7" , 0x02985B }, + { "Etc/GMT-8" , 0x0298E7 }, + { "Etc/GMT-9" , 0x029973 }, + { "Etc/GMT0" , 0x02920F }, + { "Etc/Greenwich" , 0x0299FF }, + { "Etc/UCT" , 0x029A43 }, + { "Etc/Universal" , 0x029A87 }, + { "Etc/UTC" , 0x029ACB }, + { "Etc/Zulu" , 0x029B0F }, + { "Europe/Amsterdam" , 0x029B53 }, + { "Europe/Andorra" , 0x029F91 }, + { "Europe/Athens" , 0x02A20D }, + { "Europe/Belfast" , 0x02A550 }, + { "Europe/Belgrade" , 0x02AA87 }, + { "Europe/Berlin" , 0x02AD50 }, + { "Europe/Bratislava" , 0x02B0A6 }, + { "Europe/Brussels" , 0x02B3D8 }, + { "Europe/Bucharest" , 0x02B80F }, + { "Europe/Budapest" , 0x02BB39 }, + { "Europe/Chisinau" , 0x02BEAC }, + { "Europe/Copenhagen" , 0x02C23A }, + { "Europe/Dublin" , 0x02C544 }, + { "Europe/Gibraltar" , 0x02CA55 }, + { "Europe/Guernsey" , 0x02CEAC }, + { "Europe/Helsinki" , 0x02D3E3 }, + { "Europe/Isle_of_Man" , 0x02D699 }, + { "Europe/Istanbul" , 0x02DBD0 }, + { "Europe/Jersey" , 0x02DFBD }, + { "Europe/Kaliningrad" , 0x02E4F4 }, + { "Europe/Kiev" , 0x02E857 }, + { "Europe/Lisbon" , 0x02EB6E }, + { "Europe/Ljubljana" , 0x02F072 }, + { "Europe/London" , 0x02F33B }, + { "Europe/Luxembourg" , 0x02F872 }, + { "Europe/Madrid" , 0x02FCC8 }, + { "Europe/Malta" , 0x03008E }, + { "Europe/Mariehamn" , 0x030447 }, + { "Europe/Minsk" , 0x0306FD }, + { "Europe/Monaco" , 0x030A08 }, + { "Europe/Moscow" , 0x030E43 }, + { "Europe/Nicosia" , 0x031195 }, + { "Europe/Oslo" , 0x03147D }, + { "Europe/Paris" , 0x0317AF }, + { "Europe/Podgorica" , 0x031BF5 }, + { "Europe/Prague" , 0x031EBE }, + { "Europe/Riga" , 0x0321F0 }, + { "Europe/Rome" , 0x032535 }, + { "Europe/Samara" , 0x0328F8 }, + { "Europe/San_Marino" , 0x032C31 }, + { "Europe/Sarajevo" , 0x032FF4 }, + { "Europe/Simferopol" , 0x0332BD }, + { "Europe/Skopje" , 0x0335E8 }, + { "Europe/Sofia" , 0x0338B1 }, + { "Europe/Stockholm" , 0x033BB9 }, + { "Europe/Tallinn" , 0x033E68 }, + { "Europe/Tirane" , 0x0341A2 }, + { "Europe/Tiraspol" , 0x0344A8 }, + { "Europe/Uzhgorod" , 0x034836 }, + { "Europe/Vaduz" , 0x034B4D }, + { "Europe/Vatican" , 0x034DE0 }, + { "Europe/Vienna" , 0x0351A3 }, + { "Europe/Vilnius" , 0x0354D0 }, + { "Europe/Volgograd" , 0x03580F }, + { "Europe/Warsaw" , 0x035B18 }, + { "Europe/Zagreb" , 0x035EF9 }, + { "Europe/Zaporozhye" , 0x0361C2 }, + { "Europe/Zurich" , 0x036503 }, + { "Factory" , 0x0367B2 }, + { "GB" , 0x036823 }, + { "GB-Eire" , 0x036D5A }, + { "GMT" , 0x037291 }, + { "GMT+0" , 0x03735D }, + { "GMT-0" , 0x037319 }, + { "GMT0" , 0x0372D5 }, + { "Greenwich" , 0x0373A1 }, + { "Hongkong" , 0x0373E5 }, + { "HST" , 0x0375A7 }, + { "Iceland" , 0x0375EB }, + { "Indian/Antananarivo" , 0x0377A4 }, + { "Indian/Chagos" , 0x037818 }, + { "Indian/Christmas" , 0x03787A }, + { "Indian/Cocos" , 0x0378BE }, + { "Indian/Comoro" , 0x037902 }, + { "Indian/Kerguelen" , 0x037957 }, + { "Indian/Mahe" , 0x0379AC }, + { "Indian/Maldives" , 0x037A01 }, + { "Indian/Mauritius" , 0x037A56 }, + { "Indian/Mayotte" , 0x037ACC }, + { "Indian/Reunion" , 0x037B21 }, + { "Iran" , 0x037B76 }, + { "Israel" , 0x037DE4 }, + { "Jamaica" , 0x038113 }, + { "Japan" , 0x0381D8 }, + { "Kwajalein" , 0x038261 }, + { "Libya" , 0x0382C4 }, + { "MET" , 0x0383BE }, + { "Mexico/BajaNorte" , 0x0386C7 }, + { "Mexico/BajaSur" , 0x038A30 }, + { "Mexico/General" , 0x038C75 }, + { "MST" , 0x038ED3 }, + { "MST7MDT" , 0x038F17 }, + { "Navajo" , 0x039268 }, + { "NZ" , 0x0395E1 }, + { "NZ-CHAT" , 0x03995F }, + { "Pacific/Apia" , 0x039C47 }, + { "Pacific/Auckland" , 0x039CC5 }, + { "Pacific/Chatham" , 0x03A051 }, + { "Pacific/Chuuk" , 0x03A348 }, + { "Pacific/Easter" , 0x03A3A1 }, + { "Pacific/Efate" , 0x03A6FF }, + { "Pacific/Enderbury" , 0x03A7C5 }, + { "Pacific/Fakaofo" , 0x03A833 }, + { "Pacific/Fiji" , 0x03A877 }, + { "Pacific/Funafuti" , 0x03A901 }, + { "Pacific/Galapagos" , 0x03A945 }, + { "Pacific/Gambier" , 0x03A9BD }, + { "Pacific/Guadalcanal" , 0x03AA22 }, + { "Pacific/Guam" , 0x03AA77 }, + { "Pacific/Honolulu" , 0x03AACD }, + { "Pacific/Johnston" , 0x03AB61 }, + { "Pacific/Kiritimati" , 0x03ABB3 }, + { "Pacific/Kosrae" , 0x03AC1E }, + { "Pacific/Kwajalein" , 0x03AC7B }, + { "Pacific/Majuro" , 0x03ACE7 }, + { "Pacific/Marquesas" , 0x03AD46 }, + { "Pacific/Midway" , 0x03ADAD }, + { "Pacific/Nauru" , 0x03AE37 }, + { "Pacific/Niue" , 0x03AEAF }, + { "Pacific/Norfolk" , 0x03AF0D }, + { "Pacific/Noumea" , 0x03AF62 }, + { "Pacific/Pago_Pago" , 0x03AFF2 }, + { "Pacific/Palau" , 0x03B07B }, + { "Pacific/Pitcairn" , 0x03B0BF }, + { "Pacific/Pohnpei" , 0x03B114 }, + { "Pacific/Ponape" , 0x03B169 }, + { "Pacific/Port_Moresby" , 0x03B1AE }, + { "Pacific/Rarotonga" , 0x03B1F2 }, + { "Pacific/Saipan" , 0x03B2CE }, + { "Pacific/Samoa" , 0x03B331 }, + { "Pacific/Tahiti" , 0x03B3BA }, + { "Pacific/Tarawa" , 0x03B41F }, + { "Pacific/Tongatapu" , 0x03B473 }, + { "Pacific/Truk" , 0x03B4FF }, + { "Pacific/Wake" , 0x03B544 }, + { "Pacific/Wallis" , 0x03B594 }, + { "Pacific/Yap" , 0x03B5D8 }, + { "Poland" , 0x03B61D }, + { "Portugal" , 0x03B9FE }, + { "PRC" , 0x03BEFA }, + { "PST8PDT" , 0x03BFAB }, + { "ROC" , 0x03C2FC }, + { "ROK" , 0x03C414 }, + { "Singapore" , 0x03C4B8 }, + { "Turkey" , 0x03C56F }, + { "UCT" , 0x03C95C }, + { "Universal" , 0x03C9A0 }, + { "US/Alaska" , 0x03C9E4 }, + { "US/Aleutian" , 0x03CD4D }, + { "US/Arizona" , 0x03D0B3 }, + { "US/Central" , 0x03D141 }, + { "US/East-Indiana" , 0x03DB4B }, + { "US/Eastern" , 0x03D64C }, + { "US/Hawaii" , 0x03DDB5 }, + { "US/Indiana-Starke" , 0x03DE43 }, + { "US/Michigan" , 0x03E1B4 }, + { "US/Mountain" , 0x03E4EB }, + { "US/Pacific" , 0x03E864 }, + { "US/Pacific-New" , 0x03EC69 }, + { "US/Samoa" , 0x03F06E }, + { "UTC" , 0x03F0F7 }, + { "W-SU" , 0x03F3EE }, + { "WET" , 0x03F13B }, + { "Zulu" , 0x03F729 }, }; /* This is a generated file, do not modify */ -const unsigned char timelib_timezone_db_data_builtin[259182] = { +const unsigned char timelib_timezone_db_data_builtin[259949] = { /* Africa/Abidjan */ @@ -697,7 +700,7 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { /* Africa/Cairo */ 0x50, 0x48, 0x50, 0x31, 0x01, 0x45, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0xAE, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0xC8, 0x93, 0xB4, 0xE0, +0x00, 0x00, 0x00, 0xB0, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0xC8, 0x93, 0xB4, 0xE0, 0xC8, 0xFA, 0x7B, 0xD0, 0xC9, 0xFC, 0xEF, 0xE0, 0xCA, 0xC7, 0xE8, 0xD0, 0xCB, 0xCB, 0xAE, 0x60, 0xCC, 0xDF, 0x29, 0xD0, 0xCD, 0xAC, 0xE1, 0xE0, 0xCE, 0xC6, 0xF4, 0xD0, 0xCF, 0x8F, 0x66, 0xE0, 0xD0, 0xA9, 0x79, 0xD0, 0xD1, 0x84, 0x60, 0xE0, 0xD2, 0x8A, 0xAD, 0x50, 0xE8, 0x36, 0x63, 0x60, @@ -727,35 +730,36 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x3F, 0x73, 0x57, 0x50, 0x40, 0x91, 0x7A, 0xE0, 0x41, 0x5C, 0x73, 0xD0, 0x42, 0x71, 0x5C, 0xE0, 0x43, 0x3C, 0x55, 0xD0, 0x44, 0x51, 0x3E, 0xE0, 0x45, 0x12, 0xFD, 0x50, 0x46, 0x31, 0x20, 0xE0, 0x46, 0xE0, 0x6A, 0x50, 0x48, 0x11, 0x02, 0xE0, 0x48, 0xB7, 0x11, 0xD0, 0x49, 0xF0, 0xE4, 0xE0, -0x4A, 0x8D, 0xB9, 0x50, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0xA4, 0xFA, 0x50, 0x4D, 0xB9, 0xE3, 0x60, -0x4E, 0x84, 0xDC, 0x50, 0x4F, 0x99, 0xC5, 0x60, 0x50, 0x64, 0xBE, 0x50, 0x51, 0x79, 0xA7, 0x60, -0x52, 0x44, 0xA0, 0x50, 0x53, 0x59, 0x89, 0x60, 0x54, 0x24, 0x82, 0x50, 0x55, 0x39, 0x6B, 0x60, -0x56, 0x04, 0x64, 0x50, 0x57, 0x22, 0x87, 0xE0, 0x57, 0xED, 0x80, 0xD0, 0x59, 0x02, 0x69, 0xE0, -0x59, 0xCD, 0x62, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, 0x5B, 0xAD, 0x44, 0xD0, 0x5C, 0xC2, 0x2D, 0xE0, -0x5D, 0x8D, 0x26, 0xD0, 0x5E, 0xA2, 0x0F, 0xE0, 0x5F, 0x6D, 0x08, 0xD0, 0x60, 0x8B, 0x2C, 0x60, -0x61, 0x56, 0x25, 0x50, 0x62, 0x6B, 0x0E, 0x60, 0x63, 0x36, 0x07, 0x50, 0x64, 0x4A, 0xF0, 0x60, -0x65, 0x15, 0xE9, 0x50, 0x66, 0x2A, 0xD2, 0x60, 0x66, 0xF5, 0xCB, 0x50, 0x68, 0x0A, 0xB4, 0x60, -0x68, 0xD5, 0xAD, 0x50, 0x69, 0xEA, 0x96, 0x60, 0x6A, 0xB5, 0x8F, 0x50, 0x6B, 0xD3, 0xB2, 0xE0, -0x6C, 0x9E, 0xAB, 0xD0, 0x6D, 0xB3, 0x94, 0xE0, 0x6E, 0x7E, 0x8D, 0xD0, 0x6F, 0x93, 0x76, 0xE0, -0x70, 0x5E, 0x6F, 0xD0, 0x71, 0x73, 0x58, 0xE0, 0x72, 0x3E, 0x51, 0xD0, 0x73, 0x53, 0x3A, 0xE0, -0x74, 0x1E, 0x33, 0xD0, 0x75, 0x3C, 0x57, 0x60, 0x76, 0x07, 0x50, 0x50, 0x77, 0x1C, 0x39, 0x60, -0x77, 0xE7, 0x32, 0x50, 0x78, 0xFC, 0x1B, 0x60, 0x79, 0xC7, 0x14, 0x50, 0x7A, 0xDB, 0xFD, 0x60, -0x7B, 0xA6, 0xF6, 0x50, 0x7C, 0xBB, 0xDF, 0x60, 0x7D, 0x86, 0xD8, 0x50, 0x7E, 0x9B, 0xC1, 0x60, -0x7F, 0x66, 0xBA, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, +0x4A, 0x8D, 0xB9, 0x50, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0x61, 0xBD, 0xD0, 0x4C, 0x89, 0x58, 0xE0, +0x4C, 0xA4, 0xFA, 0x50, 0x4D, 0xB9, 0xE3, 0x60, 0x4E, 0x84, 0xDC, 0x50, 0x4F, 0x99, 0xC5, 0x60, +0x50, 0x64, 0xBE, 0x50, 0x51, 0x79, 0xA7, 0x60, 0x52, 0x44, 0xA0, 0x50, 0x53, 0x59, 0x89, 0x60, +0x54, 0x24, 0x82, 0x50, 0x55, 0x39, 0x6B, 0x60, 0x56, 0x04, 0x64, 0x50, 0x57, 0x22, 0x87, 0xE0, +0x57, 0xED, 0x80, 0xD0, 0x59, 0x02, 0x69, 0xE0, 0x59, 0xCD, 0x62, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, +0x5B, 0xAD, 0x44, 0xD0, 0x5C, 0xC2, 0x2D, 0xE0, 0x5D, 0x8D, 0x26, 0xD0, 0x5E, 0xA2, 0x0F, 0xE0, +0x5F, 0x6D, 0x08, 0xD0, 0x60, 0x8B, 0x2C, 0x60, 0x61, 0x56, 0x25, 0x50, 0x62, 0x6B, 0x0E, 0x60, +0x63, 0x36, 0x07, 0x50, 0x64, 0x4A, 0xF0, 0x60, 0x65, 0x15, 0xE9, 0x50, 0x66, 0x2A, 0xD2, 0x60, +0x66, 0xF5, 0xCB, 0x50, 0x68, 0x0A, 0xB4, 0x60, 0x68, 0xD5, 0xAD, 0x50, 0x69, 0xEA, 0x96, 0x60, +0x6A, 0xB5, 0x8F, 0x50, 0x6B, 0xD3, 0xB2, 0xE0, 0x6C, 0x9E, 0xAB, 0xD0, 0x6D, 0xB3, 0x94, 0xE0, +0x6E, 0x7E, 0x8D, 0xD0, 0x6F, 0x93, 0x76, 0xE0, 0x70, 0x5E, 0x6F, 0xD0, 0x71, 0x73, 0x58, 0xE0, +0x72, 0x3E, 0x51, 0xD0, 0x73, 0x53, 0x3A, 0xE0, 0x74, 0x1E, 0x33, 0xD0, 0x75, 0x3C, 0x57, 0x60, +0x76, 0x07, 0x50, 0x50, 0x77, 0x1C, 0x39, 0x60, 0x77, 0xE7, 0x32, 0x50, 0x78, 0xFC, 0x1B, 0x60, +0x79, 0xC7, 0x14, 0x50, 0x7A, 0xDB, 0xFD, 0x60, 0x7B, 0xA6, 0xF6, 0x50, 0x7C, 0xBB, 0xDF, 0x60, +0x7D, 0x86, 0xD8, 0x50, 0x7E, 0x9B, 0xC1, 0x60, 0x7F, 0x66, 0xBA, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, -0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x03, 0x02, 0x03, -0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, -0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, +0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, +0x00, 0x01, 0x00, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, +0x02, 0x03, 0x02, 0x01, 0x00, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, -0x02, 0x03, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x05, 0x00, 0x00, -0x2A, 0x30, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x05, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, -0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB7, 0x2E, 0x88, 0x01, -0x42, 0x57, 0x88, 0x00, 0x00, 0x00, 0x00, +0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x2A, 0x30, +0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x05, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00, 0x00, 0x00, +0x1C, 0x20, 0x00, 0x05, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x00, 0x00, 0x01, +0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB7, 0x2E, 0x88, 0x01, 0x42, 0x57, 0x88, 0x00, 0x00, 0x00, +0x00, /* Africa/Casablanca */ 0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1921,6 +1925,48 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x75, 0x84, 0xA2, 0x00, 0xD7, 0xE2, 0xED, 0x00, 0x00, 0x00, 0x05, 0x42, 0x61, 0x68, 0x69, 0x61, +/* America/Bahia_Banderas */ +0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x5D, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70, +0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60, +0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0xD8, 0x91, 0xB4, 0xF0, 0x00, 0x00, 0x70, 0x80, +0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80, +0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00, +0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xF5, 0x12, 0x90, 0x3B, 0xB6, 0xD1, 0x00, +0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00, +0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80, 0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80, +0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80, 0x46, 0x0F, 0x74, 0x90, 0x47, 0x24, 0x41, 0x80, +0x47, 0xF8, 0x91, 0x10, 0x49, 0x04, 0x23, 0x80, 0x49, 0xD8, 0x73, 0x10, 0x4A, 0xE4, 0x05, 0x80, +0x4B, 0xB8, 0x55, 0x10, 0x4C, 0xCD, 0x13, 0xF0, 0x4D, 0x98, 0x29, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, +0x4F, 0x78, 0x0B, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x51, 0x61, 0x27, 0x80, 0x52, 0x6C, 0xB9, 0xF0, +0x53, 0x41, 0x09, 0x80, 0x54, 0x4C, 0x9B, 0xF0, 0x55, 0x20, 0xEB, 0x80, 0x56, 0x2C, 0x7D, 0xF0, +0x57, 0x00, 0xCD, 0x80, 0x58, 0x15, 0x9A, 0x70, 0x58, 0xE0, 0xAF, 0x80, 0x59, 0xF5, 0x7C, 0x70, +0x5A, 0xC0, 0x91, 0x80, 0x5B, 0xD5, 0x5E, 0x70, 0x5C, 0xA9, 0xAE, 0x00, 0x5D, 0xB5, 0x40, 0x70, +0x5E, 0x89, 0x90, 0x00, 0x5F, 0x95, 0x22, 0x70, 0x60, 0x69, 0x72, 0x00, 0x61, 0x7E, 0x3E, 0xF0, +0x62, 0x49, 0x54, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x64, 0x29, 0x36, 0x00, 0x65, 0x3E, 0x02, 0xF0, +0x66, 0x12, 0x52, 0x80, 0x67, 0x1D, 0xE4, 0xF0, 0x67, 0xF2, 0x34, 0x80, 0x68, 0xFD, 0xC6, 0xF0, +0x69, 0xD2, 0x16, 0x80, 0x6A, 0xDD, 0xA8, 0xF0, 0x6B, 0xB1, 0xF8, 0x80, 0x6C, 0xC6, 0xC5, 0x70, +0x6D, 0x91, 0xDA, 0x80, 0x6E, 0xA6, 0xA7, 0x70, 0x6F, 0x71, 0xBC, 0x80, 0x70, 0x86, 0x89, 0x70, +0x71, 0x5A, 0xD9, 0x00, 0x72, 0x66, 0x6B, 0x70, 0x73, 0x3A, 0xBB, 0x00, 0x74, 0x46, 0x4D, 0x70, +0x75, 0x1A, 0x9D, 0x00, 0x76, 0x2F, 0x69, 0xF0, 0x76, 0xFA, 0x7F, 0x00, 0x78, 0x0F, 0x4B, 0xF0, +0x78, 0xDA, 0x61, 0x00, 0x79, 0xEF, 0x2D, 0xF0, 0x7A, 0xBA, 0x43, 0x00, 0x7B, 0xCF, 0x0F, 0xF0, +0x7C, 0xA3, 0x5F, 0x80, 0x7D, 0xAE, 0xF1, 0xF0, 0x7E, 0x83, 0x41, 0x80, 0x7F, 0x8E, 0xD3, 0xF0, +0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, +0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, +0x01, 0x04, 0x01, 0x04, 0x01, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, +0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, +0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, +0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0xFF, 0xFF, 0x9D, +0x54, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, +0xFF, 0x8F, 0x80, 0x00, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, +0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, +0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA9, 0x11, 0x40, 0x00, 0x72, 0x0F, 0x38, 0x00, 0x00, 0x00, +0x28, 0x4D, 0x65, 0x78, 0x69, 0x63, 0x61, 0x6E, 0x20, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, +0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x42, 0x61, 0x68, 0x69, 0x61, 0x20, 0x64, 0x65, +0x20, 0x42, 0x61, 0x6E, 0x64, 0x65, 0x72, 0x61, 0x73, + /* America/Barbados */ 0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, @@ -7139,9 +7185,9 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0xE9, 0x58, 0x89, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x60, 0x00, 0x04, 0x7A, 0x7A, 0x7A, 0x00, 0x56, 0x4F, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0xB3, 0x3F, 0x01, 0xB5, -0xC6, 0x4F, 0x00, 0x00, 0x00, 0x1F, 0x56, 0x6F, 0x73, 0x74, 0x6F, 0x6B, 0x20, 0x53, 0x74, 0x61, -0x74, 0x69, 0x6F, 0x6E, 0x2C, 0x20, 0x53, 0x20, 0x4D, 0x61, 0x67, 0x6E, 0x65, 0x74, 0x69, 0x63, -0x20, 0x50, 0x6F, 0x6C, 0x65, +0xC6, 0x4F, 0x00, 0x00, 0x00, 0x1B, 0x56, 0x6F, 0x73, 0x74, 0x6F, 0x6B, 0x20, 0x53, 0x74, 0x61, +0x74, 0x69, 0x6F, 0x6E, 0x2C, 0x20, 0x4C, 0x61, 0x6B, 0x65, 0x20, 0x56, 0x6F, 0x73, 0x74, 0x6F, +0x6B, /* Arctic/Longyearbyen */ 0x50, 0x48, 0x50, 0x31, 0x01, 0x53, 0x4A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -7836,7 +7882,7 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x41, 0x5C, 0x81, 0xE0, 0x42, 0x5E, 0xE7, 0xE0, 0x43, 0x41, 0xB7, 0xF0, 0x44, 0x2D, 0xA6, 0x60, 0x45, 0x12, 0xFD, 0x50, 0x46, 0x0E, 0xD9, 0xE0, 0x46, 0xE8, 0x6F, 0x70, 0x47, 0xF1, 0x5E, 0xE0, 0x48, 0xB7, 0x2D, 0xF0, 0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xA0, 0x4A, 0x70, 0x4B, 0xAD, 0x2E, 0x9C, -0x4C, 0x80, 0x2C, 0x70, 0x4D, 0x8D, 0x10, 0x9C, 0x4E, 0x60, 0x0E, 0x70, 0x4F, 0x76, 0x2D, 0x1C, +0x4C, 0x61, 0xBD, 0xD0, 0x4D, 0x8D, 0x10, 0x9C, 0x4E, 0x60, 0x0E, 0x70, 0x4F, 0x76, 0x2D, 0x1C, 0x50, 0x49, 0x2A, 0xF0, 0x51, 0x56, 0x0F, 0x1C, 0x52, 0x29, 0x0C, 0xF0, 0x53, 0x35, 0xF1, 0x1C, 0x54, 0x08, 0xEE, 0xF0, 0x55, 0x15, 0xD3, 0x1C, 0x55, 0xE8, 0xD0, 0xF0, 0x56, 0xF5, 0xB5, 0x1C, 0x57, 0xC8, 0xB2, 0xF0, 0x58, 0xD5, 0x97, 0x1C, 0x59, 0xA8, 0x94, 0xF0, 0x5A, 0xBE, 0xB3, 0x9C, @@ -7895,7 +7941,7 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { /* Asia/Hong_Kong */ 0x50, 0x48, 0x50, 0x31, 0x01, 0x48, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x47, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x11, 0x85, 0x69, 0x5A, 0xFC, +0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x11, 0x85, 0x69, 0x5A, 0xFC, 0xC9, 0xEA, 0x57, 0xB8, 0xCA, 0xDA, 0x3A, 0xA8, 0xCB, 0x4B, 0x78, 0x80, 0xD2, 0x4C, 0x62, 0x70, 0xD3, 0x6A, 0xB7, 0x38, 0xD4, 0x93, 0x4A, 0xA8, 0xD5, 0x42, 0xB0, 0x38, 0xD6, 0x9A, 0xB9, 0xA8, 0xD7, 0x3E, 0x41, 0xB8, 0xD8, 0x2E, 0x24, 0xA8, 0xD8, 0xF9, 0x39, 0xB8, 0xDA, 0x0E, 0x06, 0xA8, @@ -7912,16 +7958,16 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x00, 0x8E, 0x22, 0xB8, 0x01, 0x7E, 0x05, 0xA8, 0x02, 0x6E, 0x04, 0xB8, 0x03, 0x5D, 0xE7, 0xA8, 0x04, 0x4D, 0xE6, 0xB8, 0x05, 0x47, 0x04, 0x28, 0x06, 0x37, 0x03, 0x38, 0x07, 0x26, 0xE6, 0x28, 0x07, 0x83, 0x3D, 0x38, 0x09, 0x06, 0xC8, 0x28, 0x09, 0xF6, 0xC7, 0x38, 0x0A, 0xE6, 0xAA, 0x28, -0x0B, 0xD6, 0xA9, 0x38, 0x0C, 0xC6, 0x8C, 0x28, 0x0D, 0xB6, 0x8B, 0x38, 0x0E, 0xA6, 0x6E, 0x28, -0x11, 0x9B, 0x39, 0x38, 0x12, 0x6F, 0x6C, 0xA8, 0x02, 0x01, 0x02, 0x03, 0x02, 0x01, 0x02, 0x01, +0x0B, 0xD6, 0xA9, 0x38, 0x0C, 0xC6, 0x8C, 0x28, 0x11, 0x9B, 0x39, 0x38, 0x12, 0x6F, 0x6C, 0xA8, +0x02, 0x01, 0x02, 0x03, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, -0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, -0x00, 0x6B, 0x04, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x04, 0x00, 0x00, 0x70, 0x80, 0x00, -0x09, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4B, 0x53, 0x54, 0x00, -0x48, 0x4B, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0xAB, 0x54, 0xAD, 0x01, 0xC0, 0xD6, 0x57, 0x00, 0x00, 0x00, 0x00, +0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x6B, 0x04, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x90, 0x01, +0x04, 0x00, 0x00, 0x70, 0x80, 0x00, 0x09, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0D, 0x4C, 0x4D, 0x54, +0x00, 0x48, 0x4B, 0x53, 0x54, 0x00, 0x48, 0x4B, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAB, 0x54, 0xAD, 0x01, 0xC0, 0xD6, 0x57, 0x00, 0x00, +0x00, 0x00, /* Asia/Hovd */ 0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -11781,7 +11827,7 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { /* Egypt */ 0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0xAE, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0xC8, 0x93, 0xB4, 0xE0, +0x00, 0x00, 0x00, 0xB0, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0xC8, 0x93, 0xB4, 0xE0, 0xC8, 0xFA, 0x7B, 0xD0, 0xC9, 0xFC, 0xEF, 0xE0, 0xCA, 0xC7, 0xE8, 0xD0, 0xCB, 0xCB, 0xAE, 0x60, 0xCC, 0xDF, 0x29, 0xD0, 0xCD, 0xAC, 0xE1, 0xE0, 0xCE, 0xC6, 0xF4, 0xD0, 0xCF, 0x8F, 0x66, 0xE0, 0xD0, 0xA9, 0x79, 0xD0, 0xD1, 0x84, 0x60, 0xE0, 0xD2, 0x8A, 0xAD, 0x50, 0xE8, 0x36, 0x63, 0x60, @@ -11811,35 +11857,36 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x3F, 0x73, 0x57, 0x50, 0x40, 0x91, 0x7A, 0xE0, 0x41, 0x5C, 0x73, 0xD0, 0x42, 0x71, 0x5C, 0xE0, 0x43, 0x3C, 0x55, 0xD0, 0x44, 0x51, 0x3E, 0xE0, 0x45, 0x12, 0xFD, 0x50, 0x46, 0x31, 0x20, 0xE0, 0x46, 0xE0, 0x6A, 0x50, 0x48, 0x11, 0x02, 0xE0, 0x48, 0xB7, 0x11, 0xD0, 0x49, 0xF0, 0xE4, 0xE0, -0x4A, 0x8D, 0xB9, 0x50, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0xA4, 0xFA, 0x50, 0x4D, 0xB9, 0xE3, 0x60, -0x4E, 0x84, 0xDC, 0x50, 0x4F, 0x99, 0xC5, 0x60, 0x50, 0x64, 0xBE, 0x50, 0x51, 0x79, 0xA7, 0x60, -0x52, 0x44, 0xA0, 0x50, 0x53, 0x59, 0x89, 0x60, 0x54, 0x24, 0x82, 0x50, 0x55, 0x39, 0x6B, 0x60, -0x56, 0x04, 0x64, 0x50, 0x57, 0x22, 0x87, 0xE0, 0x57, 0xED, 0x80, 0xD0, 0x59, 0x02, 0x69, 0xE0, -0x59, 0xCD, 0x62, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, 0x5B, 0xAD, 0x44, 0xD0, 0x5C, 0xC2, 0x2D, 0xE0, -0x5D, 0x8D, 0x26, 0xD0, 0x5E, 0xA2, 0x0F, 0xE0, 0x5F, 0x6D, 0x08, 0xD0, 0x60, 0x8B, 0x2C, 0x60, -0x61, 0x56, 0x25, 0x50, 0x62, 0x6B, 0x0E, 0x60, 0x63, 0x36, 0x07, 0x50, 0x64, 0x4A, 0xF0, 0x60, -0x65, 0x15, 0xE9, 0x50, 0x66, 0x2A, 0xD2, 0x60, 0x66, 0xF5, 0xCB, 0x50, 0x68, 0x0A, 0xB4, 0x60, -0x68, 0xD5, 0xAD, 0x50, 0x69, 0xEA, 0x96, 0x60, 0x6A, 0xB5, 0x8F, 0x50, 0x6B, 0xD3, 0xB2, 0xE0, -0x6C, 0x9E, 0xAB, 0xD0, 0x6D, 0xB3, 0x94, 0xE0, 0x6E, 0x7E, 0x8D, 0xD0, 0x6F, 0x93, 0x76, 0xE0, -0x70, 0x5E, 0x6F, 0xD0, 0x71, 0x73, 0x58, 0xE0, 0x72, 0x3E, 0x51, 0xD0, 0x73, 0x53, 0x3A, 0xE0, -0x74, 0x1E, 0x33, 0xD0, 0x75, 0x3C, 0x57, 0x60, 0x76, 0x07, 0x50, 0x50, 0x77, 0x1C, 0x39, 0x60, -0x77, 0xE7, 0x32, 0x50, 0x78, 0xFC, 0x1B, 0x60, 0x79, 0xC7, 0x14, 0x50, 0x7A, 0xDB, 0xFD, 0x60, -0x7B, 0xA6, 0xF6, 0x50, 0x7C, 0xBB, 0xDF, 0x60, 0x7D, 0x86, 0xD8, 0x50, 0x7E, 0x9B, 0xC1, 0x60, -0x7F, 0x66, 0xBA, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, +0x4A, 0x8D, 0xB9, 0x50, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0x61, 0xBD, 0xD0, 0x4C, 0x89, 0x58, 0xE0, +0x4C, 0xA4, 0xFA, 0x50, 0x4D, 0xB9, 0xE3, 0x60, 0x4E, 0x84, 0xDC, 0x50, 0x4F, 0x99, 0xC5, 0x60, +0x50, 0x64, 0xBE, 0x50, 0x51, 0x79, 0xA7, 0x60, 0x52, 0x44, 0xA0, 0x50, 0x53, 0x59, 0x89, 0x60, +0x54, 0x24, 0x82, 0x50, 0x55, 0x39, 0x6B, 0x60, 0x56, 0x04, 0x64, 0x50, 0x57, 0x22, 0x87, 0xE0, +0x57, 0xED, 0x80, 0xD0, 0x59, 0x02, 0x69, 0xE0, 0x59, 0xCD, 0x62, 0xD0, 0x5A, 0xE2, 0x4B, 0xE0, +0x5B, 0xAD, 0x44, 0xD0, 0x5C, 0xC2, 0x2D, 0xE0, 0x5D, 0x8D, 0x26, 0xD0, 0x5E, 0xA2, 0x0F, 0xE0, +0x5F, 0x6D, 0x08, 0xD0, 0x60, 0x8B, 0x2C, 0x60, 0x61, 0x56, 0x25, 0x50, 0x62, 0x6B, 0x0E, 0x60, +0x63, 0x36, 0x07, 0x50, 0x64, 0x4A, 0xF0, 0x60, 0x65, 0x15, 0xE9, 0x50, 0x66, 0x2A, 0xD2, 0x60, +0x66, 0xF5, 0xCB, 0x50, 0x68, 0x0A, 0xB4, 0x60, 0x68, 0xD5, 0xAD, 0x50, 0x69, 0xEA, 0x96, 0x60, +0x6A, 0xB5, 0x8F, 0x50, 0x6B, 0xD3, 0xB2, 0xE0, 0x6C, 0x9E, 0xAB, 0xD0, 0x6D, 0xB3, 0x94, 0xE0, +0x6E, 0x7E, 0x8D, 0xD0, 0x6F, 0x93, 0x76, 0xE0, 0x70, 0x5E, 0x6F, 0xD0, 0x71, 0x73, 0x58, 0xE0, +0x72, 0x3E, 0x51, 0xD0, 0x73, 0x53, 0x3A, 0xE0, 0x74, 0x1E, 0x33, 0xD0, 0x75, 0x3C, 0x57, 0x60, +0x76, 0x07, 0x50, 0x50, 0x77, 0x1C, 0x39, 0x60, 0x77, 0xE7, 0x32, 0x50, 0x78, 0xFC, 0x1B, 0x60, +0x79, 0xC7, 0x14, 0x50, 0x7A, 0xDB, 0xFD, 0x60, 0x7B, 0xA6, 0xF6, 0x50, 0x7C, 0xBB, 0xDF, 0x60, +0x7D, 0x86, 0xD8, 0x50, 0x7E, 0x9B, 0xC1, 0x60, 0x7F, 0x66, 0xBA, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, -0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x03, 0x02, 0x03, -0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, -0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, +0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, +0x00, 0x01, 0x00, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, +0x02, 0x03, 0x02, 0x01, 0x00, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, -0x02, 0x03, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x05, 0x00, 0x00, -0x2A, 0x30, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x05, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, -0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, -0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, +0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x2A, 0x30, +0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x05, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00, 0x00, 0x00, +0x1C, 0x20, 0x00, 0x05, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x00, 0x00, 0x01, +0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, +0x00, /* Eire */ 0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -13180,8 +13227,8 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x50, 0x48, 0x50, 0x31, 0x01, 0x46, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x73, 0x6F, 0x18, -0xCB, 0xCE, 0x51, 0x60, 0xCC, 0xBF, 0x85, 0xD0, 0x15, 0x23, 0xEB, 0x90, 0x16, 0x13, 0xDC, 0x90, -0x17, 0x03, 0xCD, 0x90, 0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xAF, 0x90, 0x19, 0xD3, 0xA0, 0x90, +0xCB, 0xCE, 0x51, 0x60, 0xCC, 0xBF, 0x85, 0xD0, 0x15, 0x23, 0xDD, 0x80, 0x16, 0x13, 0xCE, 0x80, +0x17, 0x03, 0xBF, 0x80, 0x17, 0xF3, 0xB0, 0x80, 0x18, 0xE3, 0xAF, 0x90, 0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90, 0x1B, 0xBC, 0xBD, 0x10, 0x1C, 0xAC, 0xAE, 0x10, 0x1D, 0x9C, 0x9F, 0x10, 0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10, 0x21, 0x5C, 0x63, 0x10, 0x22, 0x4C, 0x54, 0x10, 0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10, 0x25, 0x1C, 0x27, 0x10, @@ -13209,7 +13256,7 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, -0x02, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, +0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, @@ -13985,8 +14032,8 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x73, 0x6F, 0x18, -0xCB, 0xCE, 0x51, 0x60, 0xCC, 0xBF, 0x85, 0xD0, 0x15, 0x23, 0xEB, 0x90, 0x16, 0x13, 0xDC, 0x90, -0x17, 0x03, 0xCD, 0x90, 0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xAF, 0x90, 0x19, 0xD3, 0xA0, 0x90, +0xCB, 0xCE, 0x51, 0x60, 0xCC, 0xBF, 0x85, 0xD0, 0x15, 0x23, 0xDD, 0x80, 0x16, 0x13, 0xCE, 0x80, +0x17, 0x03, 0xBF, 0x80, 0x17, 0xF3, 0xB0, 0x80, 0x18, 0xE3, 0xAF, 0x90, 0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90, 0x1B, 0xBC, 0xBD, 0x10, 0x1C, 0xAC, 0xAE, 0x10, 0x1D, 0x9C, 0x9F, 0x10, 0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10, 0x21, 0x5C, 0x63, 0x10, 0x22, 0x4C, 0x54, 0x10, 0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10, 0x25, 0x1C, 0x27, 0x10, @@ -14014,7 +14061,7 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, -0x02, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, +0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, @@ -15870,7 +15917,7 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { /* Hongkong */ 0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x47, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x11, 0x85, 0x69, 0x5A, 0xFC, +0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x11, 0x85, 0x69, 0x5A, 0xFC, 0xC9, 0xEA, 0x57, 0xB8, 0xCA, 0xDA, 0x3A, 0xA8, 0xCB, 0x4B, 0x78, 0x80, 0xD2, 0x4C, 0x62, 0x70, 0xD3, 0x6A, 0xB7, 0x38, 0xD4, 0x93, 0x4A, 0xA8, 0xD5, 0x42, 0xB0, 0x38, 0xD6, 0x9A, 0xB9, 0xA8, 0xD7, 0x3E, 0x41, 0xB8, 0xD8, 0x2E, 0x24, 0xA8, 0xD8, 0xF9, 0x39, 0xB8, 0xDA, 0x0E, 0x06, 0xA8, @@ -15887,16 +15934,16 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x00, 0x8E, 0x22, 0xB8, 0x01, 0x7E, 0x05, 0xA8, 0x02, 0x6E, 0x04, 0xB8, 0x03, 0x5D, 0xE7, 0xA8, 0x04, 0x4D, 0xE6, 0xB8, 0x05, 0x47, 0x04, 0x28, 0x06, 0x37, 0x03, 0x38, 0x07, 0x26, 0xE6, 0x28, 0x07, 0x83, 0x3D, 0x38, 0x09, 0x06, 0xC8, 0x28, 0x09, 0xF6, 0xC7, 0x38, 0x0A, 0xE6, 0xAA, 0x28, -0x0B, 0xD6, 0xA9, 0x38, 0x0C, 0xC6, 0x8C, 0x28, 0x0D, 0xB6, 0x8B, 0x38, 0x0E, 0xA6, 0x6E, 0x28, -0x11, 0x9B, 0x39, 0x38, 0x12, 0x6F, 0x6C, 0xA8, 0x02, 0x01, 0x02, 0x03, 0x02, 0x01, 0x02, 0x01, +0x0B, 0xD6, 0xA9, 0x38, 0x0C, 0xC6, 0x8C, 0x28, 0x11, 0x9B, 0x39, 0x38, 0x12, 0x6F, 0x6C, 0xA8, +0x02, 0x01, 0x02, 0x03, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, -0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, -0x00, 0x6B, 0x04, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x04, 0x00, 0x00, 0x70, 0x80, 0x00, -0x09, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4B, 0x53, 0x54, 0x00, -0x48, 0x4B, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, +0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x6B, 0x04, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x90, 0x01, +0x04, 0x00, 0x00, 0x70, 0x80, 0x00, 0x09, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0D, 0x4C, 0x4D, 0x54, +0x00, 0x48, 0x4B, 0x53, 0x54, 0x00, 0x48, 0x4B, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, +0x00, 0x00, /* HST */ 0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -16592,7 +16639,7 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x50, 0x48, 0x50, 0x31, 0x01, 0x57, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x12, 0x91, 0x05, 0xFC, 0x00, -0xDA, 0x62, 0x04, 0x38, 0x4C, 0x9F, 0x27, 0xB0, 0x4D, 0x98, 0x45, 0x20, 0x01, 0x02, 0x03, 0x02, +0xDA, 0x62, 0x04, 0x38, 0x4C, 0x9F, 0x27, 0xB0, 0x4D, 0x98, 0x53, 0x30, 0x01, 0x02, 0x03, 0x02, 0xFF, 0xFF, 0x5F, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x5E, 0x48, 0x00, 0x04, 0xFF, 0xFF, 0x65, 0x50, 0x00, 0x09, 0xFF, 0xFF, 0x73, 0x60, 0x01, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x41, 0x4D, 0x54, 0x00, 0x57, 0x53, 0x54, 0x00, 0x57, 0x53, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -16707,6 +16754,14 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x00, 0x05, 0x43, 0xA7, 0x00, 0x00, 0x00, 0x0F, 0x43, 0x68, 0x61, 0x74, 0x68, 0x61, 0x6D, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73, +/* Pacific/Chuuk */ +0x50, 0x48, 0x50, 0x31, 0x01, 0x46, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x8C, 0xA0, +0x00, 0x00, 0x43, 0x48, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x94, 0xA5, 0x62, 0x01, 0xFA, 0x42, +0xDD, 0x00, 0x00, 0x00, 0x14, 0x43, 0x68, 0x75, 0x75, 0x6B, 0x20, 0x28, 0x54, 0x72, 0x75, 0x6B, +0x29, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x59, 0x61, 0x70, + /* Pacific/Easter */ 0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, @@ -16799,7 +16854,7 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0D, 0x9A, 0x13, 0xB2, 0x3C, 0x36, 0x3B, 0x17, 0xE0, 0x36, 0xD7, 0xFA, 0x60, 0x38, 0x24, 0x34, 0x60, 0x38, 0xB7, 0xDC, 0x60, -0x4B, 0x11, 0x2C, 0xE0, 0x4B, 0xAE, 0x0F, 0x60, 0x4C, 0xC2, 0xEA, 0x60, 0x4D, 0x8D, 0xF1, 0x60, +0x4B, 0x11, 0x2C, 0xE0, 0x4B, 0xAE, 0x0F, 0x60, 0x4C, 0xC2, 0xEA, 0x60, 0x4D, 0x72, 0x41, 0xE0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0xA7, 0x44, 0x00, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x01, 0x04, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x46, 0x4A, 0x53, 0x54, 0x00, 0x46, 0x4A, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, @@ -16985,13 +17040,20 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x00, 0x50, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x14, 0x95, 0x00, 0x4C, 0x2A, 0xB2, 0x00, 0x00, 0x00, 0x00, -/* Pacific/Ponape */ +/* Pacific/Pohnpei */ 0x50, 0x48, 0x50, 0x31, 0x01, 0x46, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x9A, 0xB0, 0x00, 0x00, 0x50, 0x4F, 0x4E, 0x54, 0x00, 0x00, 0x00, 0x00, 0x93, 0xF5, 0x9A, 0x02, 0x04, 0x13, -0xE2, 0x00, 0x00, 0x00, 0x10, 0x50, 0x6F, 0x6E, 0x61, 0x70, 0x65, 0x20, 0x28, 0x50, 0x6F, 0x68, -0x6E, 0x70, 0x65, 0x69, 0x29, +0xE2, 0x00, 0x00, 0x00, 0x10, 0x50, 0x6F, 0x68, 0x6E, 0x70, 0x65, 0x69, 0x20, 0x28, 0x50, 0x6F, +0x6E, 0x61, 0x70, 0x65, 0x29, + +/* Pacific/Ponape */ +0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x9A, 0xB0, +0x00, 0x00, 0x50, 0x4F, 0x4E, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, +0x80, 0x00, 0x00, 0x00, 0x00, /* Pacific/Port_Moresby */ 0x50, 0x48, 0x50, 0x31, 0x01, 0x50, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -17065,12 +17127,11 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x00, 0x69, 0x08, 0x05, 0x00, 0x07, 0x60, 0x05, 0x00, 0x00, 0x00, 0x00, /* Pacific/Truk */ -0x50, 0x48, 0x50, 0x31, 0x01, 0x46, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x8C, 0xA0, -0x00, 0x00, 0x54, 0x52, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x94, 0xA5, 0x62, 0x01, 0xFA, 0x42, -0xDD, 0x00, 0x00, 0x00, 0x14, 0x54, 0x72, 0x75, 0x6B, 0x20, 0x28, 0x43, 0x68, 0x75, 0x75, 0x6B, -0x29, 0x20, 0x61, 0x6E, 0x64, 0x20, 0x59, 0x61, 0x70, +0x00, 0x00, 0x43, 0x48, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, +0x80, 0x00, 0x00, 0x00, 0x00, /* Pacific/Wake */ 0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -17091,7 +17152,7 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x8C, 0xA0, -0x00, 0x00, 0x54, 0x52, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, +0x00, 0x00, 0x43, 0x48, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, /* Poland */ @@ -18208,4 +18269,4 @@ const unsigned char timelib_timezone_db_data_builtin[259182] = { 0x00, 0x00, 0x55, 0x54, 0x43, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, }; -const timelib_tzdb timezonedb_builtin = { "2010.9", 565, timezonedb_idx_builtin, timelib_timezone_db_data_builtin }; +const timelib_tzdb timezonedb_builtin = { "2010.15", 568, timezonedb_idx_builtin, timelib_timezone_db_data_builtin }; diff --git a/ext/date/lib/tm2unixtime.c b/ext/date/lib/tm2unixtime.c index 81befbe10..de877a382 100644 --- a/ext/date/lib/tm2unixtime.c +++ b/ext/date/lib/tm2unixtime.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tm2unixtime.c 298973 2010-05-04 15:11:41Z derick $ */ +/* $Id: tm2unixtime.c 302890 2010-08-30 16:25:52Z derick $ */ #include "timelib.h" @@ -444,6 +444,7 @@ void timelib_update_ts(timelib_time* time, timelib_tzinfo* tzi) time->sse = res; time->sse_uptodate = 1; + time->have_relative = time->relative.have_weekday_relative = time->relative.have_special_relative = 0; } #if 0 diff --git a/ext/date/lib/unixtime2tm.c b/ext/date/lib/unixtime2tm.c index 416de9b5b..c12d9a3a7 100644 --- a/ext/date/lib/unixtime2tm.c +++ b/ext/date/lib/unixtime2tm.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: unixtime2tm.c 293036 2010-01-03 09:23:27Z sebastian $ */ +/* $Id: unixtime2tm.c 307131 2011-01-05 15:34:34Z johannes $ */ #include "timelib.h" @@ -55,6 +55,12 @@ void timelib_unixtime2gmt(timelib_time* tm, timelib_sll ts) if (ts >= 0) { tmp_days = days + 1; + + if (tmp_days >= DAYS_PER_LYEAR_PERIOD || tmp_days <= -DAYS_PER_LYEAR_PERIOD) { + cur_year += YEARS_PER_LYEAR_PERIOD * (tmp_days / DAYS_PER_LYEAR_PERIOD); + tmp_days -= DAYS_PER_LYEAR_PERIOD * (tmp_days / DAYS_PER_LYEAR_PERIOD); + } + while (tmp_days >= DAYS_PER_LYEAR) { cur_year++; if (timelib_is_leap(cur_year)) { |
