- PHPAPI + static don't mix, obviously.

diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index 12589e121db216b10b6bfcf103bbc496ce37172a..74fe22b8db86b128510d6dee7f3bb064dbf7f293 100644 (file)
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.8.dev on Mon Jul  4 09:14:41 2005 */
+/* Generated by re2c 0.9.8.dev on Mon Jul  4 10:36:41 2005 */
 #line 1 "resource/parse_date.re"
 /*
    +----------------------------------------------------------------------+
@@ -193,6 +193,7 @@ static timelib_tz_lookup_table const timelib_timezone_lookup[] = {
        { "eadt", 1,   -HOUR ( 10), "Australia/Sydney"    }, /* Eastern Australian Daylight */
        { "east", 0,   -HOUR ( 10), "Australia/Sydney"    }, /* Eastern Australian Standard */
        { "edt",  1,    HOUR (  5), "America/New_York"    }, /* Eastern Daylight */
+       { "eest", 1,    HOUR (  2), "Europe/Helsinki"     }, /* Eastern European Summer */
        { "eet",  0,   -HOUR (  2), "Europe/Bucharest"    }, /* Eastern Europe, USSR Zone 1 */
        { "est",  0,    HOUR (  5), "America/New_York"    }, /* Eastern Standard */
        { "f",    0,    HOUR (- 6), NULL                  },
@@ -219,6 +220,8 @@ static timelib_tz_lookup_table const timelib_timezone_lookup[] = {
        { "mesz", 1,   -HOUR (  1), "MET"                 }, /* Middle European Summer */
        { "met",  0,   -HOUR (  1), "MET"                 }, /* Middle European */
        { "mewt", 0,   -HOUR (  1), "MET"                 }, /* Middle European Winter */
+       { "msd",  1,    HOUR (  3), "Europe/Moscow"       }, /* Moscow Summer */
+       { "msk",  0,    HOUR (  3), "Europe/Moscow"       }, /* Moscow */
        { "mst",  0,    HOUR (  7), "America/Phoenix"     }, /* Mountain Standard */
        { "n",    0,    HOUR (  1), NULL                  },
        { "ndt",  1,    HOUR (3.5), "America/St_Johns"    }, /* Newfoundland Daylight */
@@ -775,7 +778,7 @@ static int scan(Scanner *s)
 std:
        s->tok = cursor;
        s->len = 0;
-#line 879 "resource/parse_date.re"
+#line 882 "resource/parse_date.re"
 
 
 {
@@ -814,7 +817,7 @@ std:
          0,   0,   0,   0,   0,   0,   0,   0, 
        };
 
-#line 818 "<stdout>"
+#line 821 "<stdout>"
 {
        YYCTYPE yych;
        unsigned int yyaccept;
@@ -899,7 +902,7 @@ yy2:
 yy3:
        YYDEBUG(3, *YYCURSOR);
 
-#line 1325 "resource/parse_date.re"
+#line 1328 "resource/parse_date.re"
 {
                int tz_not_found;
                TIMELIB_INIT;
@@ -908,7 +911,7 @@ yy3:
                TIMELIB_DEINIT;
                return TIMELIB_TIMEZONE;
        }
-#line 905 "<stdout>"
+#line 908 "<stdout>"
 yy4:
        YYDEBUG(4, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -994,13 +997,13 @@ yy6:
 yy7:
        YYDEBUG(7, *YYCURSOR);
 
-#line 1389 "resource/parse_date.re"
+#line 1392 "resource/parse_date.re"
 {
 /*             printf("unexpected character: #%d, %c ", *s->tok, *s->tok); */
                s->errors++;
                goto std;
        }
-#line 988 "<stdout>"
+#line 991 "<stdout>"
 yy8:
        YYDEBUG(8, *YYCURSOR);
        yyaccept = 0;
@@ -1901,11 +1904,11 @@ yy43:
 yy44:
        YYDEBUG(44, *YYCURSOR);
 
-#line 1378 "resource/parse_date.re"
+#line 1381 "resource/parse_date.re"
 {
                goto std;
        }
-#line 1814 "<stdout>"
+#line 1817 "<stdout>"
 yy45:
        YYDEBUG(45, *YYCURSOR);
        ++YYCURSOR;
@@ -1913,12 +1916,12 @@ yy45:
 yy46:
        YYDEBUG(46, *YYCURSOR);
 
-#line 1383 "resource/parse_date.re"
+#line 1386 "resource/parse_date.re"
 {
                s->pos = cursor; s->line++;
                goto std;
        }
-#line 1823 "<stdout>"
+#line 1826 "<stdout>"
 yy47:
        YYDEBUG(47, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -2311,7 +2314,7 @@ yy84:
 yy85:
        YYDEBUG(85, *YYCURSOR);
 
-#line 1362 "resource/parse_date.re"
+#line 1365 "resource/parse_date.re"
 {
                timelib_ull i;
 
@@ -2326,7 +2329,7 @@ yy85:
                TIMELIB_DEINIT;
                return TIMELIB_RELATIVE;
        }
-#line 2152 "<stdout>"
+#line 2155 "<stdout>"
 yy86:
        YYDEBUG(86, *YYCURSOR);
        ++YYCURSOR;
@@ -2956,11 +2959,11 @@ yy150:
 yy151:
        YYDEBUG(151, *YYCURSOR);
 
-#line 1320 "resource/parse_date.re"
+#line 1323 "resource/parse_date.re"
 {
                goto std;
        }
-#line 2654 "<stdout>"
+#line 2657 "<stdout>"
 yy152:
        YYDEBUG(152, *YYCURSOR);
        yyaccept = 1;
@@ -2999,7 +3002,7 @@ yy157:
 yy158:
        YYDEBUG(158, *YYCURSOR);
 
-#line 1304 "resource/parse_date.re"
+#line 1307 "resource/parse_date.re"
 {
                const timelib_relunit* relunit;
 
@@ -3014,7 +3017,7 @@ yy158:
                TIMELIB_DEINIT;
                return TIMELIB_RELATIVE;
        }
-#line 2694 "<stdout>"
+#line 2697 "<stdout>"
 yy159:
        YYDEBUG(159, *YYCURSOR);
        yyaccept = 1;
@@ -3384,7 +3387,7 @@ yy190:
 yy191:
        YYDEBUG(191, *YYCURSOR);
 
-#line 1288 "resource/parse_date.re"
+#line 1291 "resource/parse_date.re"
 {
                timelib_sll i;
 
@@ -3399,7 +3402,7 @@ yy191:
                TIMELIB_DEINIT;
                return TIMELIB_RELATIVE;
        }
-#line 3011 "<stdout>"
+#line 3014 "<stdout>"
 yy192:
        YYDEBUG(192, *YYCURSOR);
        ++YYCURSOR;
@@ -5615,7 +5618,7 @@ yy386:
 yy387:
        YYDEBUG(387, *YYCURSOR);
 
-#line 1114 "resource/parse_date.re"
+#line 1117 "resource/parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -5626,7 +5629,7 @@ yy387:
                TIMELIB_DEINIT;
                return TIMELIB_DATE_NO_DAY;
        }
-#line 4842 "<stdout>"
+#line 4845 "<stdout>"
 yy388:
        YYDEBUG(388, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -5666,7 +5669,7 @@ yy392:
 yy393:
        YYDEBUG(393, *YYCURSOR);
 
-#line 1138 "resource/parse_date.re"
+#line 1141 "resource/parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -5677,7 +5680,7 @@ yy393:
                TIMELIB_DEINIT;
                return TIMELIB_DATE_TEXT;
        }
-#line 4881 "<stdout>"
+#line 4884 "<stdout>"
 yy394:
        YYDEBUG(394, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -5766,7 +5769,7 @@ yy404:
 yy405:
        YYDEBUG(405, *YYCURSOR);
 
-#line 1335 "resource/parse_date.re"
+#line 1338 "resource/parse_date.re"
 {
                int tz_not_found;
                TIMELIB_INIT;
@@ -5792,7 +5795,7 @@ yy405:
                TIMELIB_DEINIT;
                return TIMELIB_SHORTDATE_WITH_TIME;
        }
-#line 4972 "<stdout>"
+#line 4975 "<stdout>"
 yy406:
        YYDEBUG(406, *YYCURSOR);
        yyaccept = 7;
@@ -6159,7 +6162,7 @@ yy449:
 yy450:
        YYDEBUG(450, *YYCURSOR);
 
-#line 1232 "resource/parse_date.re"
+#line 1235 "resource/parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -6170,7 +6173,7 @@ yy450:
                TIMELIB_DEINIT;
                return TIMELIB_PG_TEXT;
        }
-#line 5260 "<stdout>"
+#line 5263 "<stdout>"
 yy451:
        YYDEBUG(451, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -7631,7 +7634,7 @@ yy554:
 yy555:
        YYDEBUG(555, *YYCURSOR);
 
-#line 1274 "resource/parse_date.re"
+#line 1277 "resource/parse_date.re"
 {
                TIMELIB_INIT;
                s->time->relative.y = 0 - s->time->relative.y;
@@ -7644,7 +7647,7 @@ yy555:
                TIMELIB_DEINIT;
                return TIMELIB_AGO;
        }
-#line 6524 "<stdout>"
+#line 6527 "<stdout>"
 yy556:
        YYDEBUG(556, *YYCURSOR);
        yyaccept = 1;
@@ -9439,7 +9442,7 @@ yy667:
 yy668:
        YYDEBUG(668, *YYCURSOR);
 
-#line 966 "resource/parse_date.re"
+#line 969 "resource/parse_date.re"
 {
                int tz_not_found;
                DEBUG_OUTPUT("timeshort24 | timelong24 | iso8601long");
@@ -9462,7 +9465,7 @@ yy668:
                TIMELIB_DEINIT;
                return TIMELIB_TIME24_WITH_ZONE;
        }
-#line 8112 "<stdout>"
+#line 8115 "<stdout>"
 yy669:
        YYDEBUG(669, *YYCURSOR);
        yyaccept = 10;
@@ -9589,7 +9592,7 @@ yy682:
 yy683:
        YYDEBUG(683, *YYCURSOR);
 
-#line 951 "resource/parse_date.re"
+#line 954 "resource/parse_date.re"
 {
                DEBUG_OUTPUT("timeshort12 | timelong12");
                TIMELIB_INIT;
@@ -9603,7 +9606,7 @@ yy683:
                TIMELIB_DEINIT;
                return TIMELIB_TIME12;
        }
-#line 8223 "<stdout>"
+#line 8226 "<stdout>"
 yy684:
        YYDEBUG(684, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -9713,7 +9716,7 @@ yy695:
 yy696:
        YYDEBUG(696, *YYCURSOR);
 
-#line 1090 "resource/parse_date.re"
+#line 1093 "resource/parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -9724,7 +9727,7 @@ yy696:
                TIMELIB_DEINIT;
                return TIMELIB_DATE_FULL;
        }
-#line 8318 "<stdout>"
+#line 8321 "<stdout>"
 yy697:
        YYDEBUG(697, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -10091,7 +10094,7 @@ yy754:
 yy755:
        YYDEBUG(755, *YYCURSOR);
 
-#line 1102 "resource/parse_date.re"
+#line 1105 "resource/parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -10102,7 +10105,7 @@ yy755:
                TIMELIB_DEINIT;
                return TIMELIB_DATE_FULL_POINTED;
        }
-#line 8578 "<stdout>"
+#line 8581 "<stdout>"
 yy756:
        YYDEBUG(756, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -10474,7 +10477,7 @@ yy799:
 yy800:
        YYDEBUG(800, *YYCURSOR);
 
-#line 1078 "resource/parse_date.re"
+#line 1081 "resource/parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -10485,7 +10488,7 @@ yy800:
                TIMELIB_DEINIT;
                return TIMELIB_ISO_DATE;
        }
-#line 8871 "<stdout>"
+#line 8874 "<stdout>"
 yy801:
        YYDEBUG(801, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -10507,7 +10510,7 @@ yy803:
 yy804:
        YYDEBUG(804, *YYCURSOR);
 
-#line 1053 "resource/parse_date.re"
+#line 1056 "resource/parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -10520,7 +10523,7 @@ yy804:
                TIMELIB_DEINIT;
                return TIMELIB_AMERICAN;
        }
-#line 8898 "<stdout>"
+#line 8901 "<stdout>"
 yy805:
        YYDEBUG(805, *YYCURSOR);
        yyaccept = 11;
@@ -10742,7 +10745,7 @@ yy836:
 yy837:
        YYDEBUG(837, *YYCURSOR);
 
-#line 1256 "resource/parse_date.re"
+#line 1259 "resource/parse_date.re"
 {
                int tz_not_found;
                TIMELIB_INIT;
@@ -10759,7 +10762,7 @@ yy837:
                TIMELIB_DEINIT;
                return TIMELIB_CLF;
        }
-#line 9071 "<stdout>"
+#line 9074 "<stdout>"
 yy838:
        YYDEBUG(838, *YYCURSOR);
        yyaccept = 12;
@@ -11071,7 +11074,7 @@ yy876:
 yy877:
        YYDEBUG(877, *YYCURSOR);
 
-#line 1244 "resource/parse_date.re"
+#line 1247 "resource/parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -11082,7 +11085,7 @@ yy877:
                TIMELIB_DEINIT;
                return TIMELIB_PG_TEXT;
        }
-#line 9313 "<stdout>"
+#line 9316 "<stdout>"
 yy878:
        YYDEBUG(878, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -11328,7 +11331,7 @@ yy896:
 yy897:
        YYDEBUG(897, *YYCURSOR);
 
-#line 1126 "resource/parse_date.re"
+#line 1129 "resource/parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -11339,7 +11342,7 @@ yy897:
                TIMELIB_DEINIT;
                return TIMELIB_DATE_NO_DAY;
        }
-#line 9526 "<stdout>"
+#line 9529 "<stdout>"
 yy898:
        YYDEBUG(898, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -11493,7 +11496,7 @@ yy916:
 yy917:
        YYDEBUG(917, *YYCURSOR);
 
-#line 1213 "resource/parse_date.re"
+#line 1216 "resource/parse_date.re"
 {
                timelib_sll w, d;
 
@@ -11511,7 +11514,7 @@ yy917:
                TIMELIB_DEINIT;
                return TIMELIB_ISO_WEEK;
        }
-#line 9658 "<stdout>"
+#line 9661 "<stdout>"
 yy918:
        YYDEBUG(918, *YYCURSOR);
        ++YYCURSOR;
@@ -11519,7 +11522,7 @@ yy918:
 yy919:
        YYDEBUG(919, *YYCURSOR);
 
-#line 1194 "resource/parse_date.re"
+#line 1197 "resource/parse_date.re"
 {
                timelib_sll w, d;
 
@@ -11537,7 +11540,7 @@ yy919:
                TIMELIB_DEINIT;
                return TIMELIB_ISO_WEEK;
        }
-#line 9680 "<stdout>"
+#line 9683 "<stdout>"
 yy920:
        YYDEBUG(920, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -11570,7 +11573,7 @@ yy922:
 yy923:
        YYDEBUG(923, *YYCURSOR);
 
-#line 1182 "resource/parse_date.re"
+#line 1185 "resource/parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -11581,7 +11584,7 @@ yy923:
                TIMELIB_DEINIT;
                return TIMELIB_PG_YEARDAY;
        }
-#line 9716 "<stdout>"
+#line 9719 "<stdout>"
 yy924:
        YYDEBUG(924, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -11657,7 +11660,7 @@ yy929:
 yy930:
        YYDEBUG(930, *YYCURSOR);
 
-#line 1150 "resource/parse_date.re"
+#line 1153 "resource/parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -11667,7 +11670,7 @@ yy930:
                TIMELIB_DEINIT;
                return TIMELIB_DATE_NOCOLON;
        }
-#line 9788 "<stdout>"
+#line 9791 "<stdout>"
 yy931:
        YYDEBUG(931, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -11735,7 +11738,7 @@ yy940:
 yy941:
        YYDEBUG(941, *YYCURSOR);
 
-#line 1161 "resource/parse_date.re"
+#line 1164 "resource/parse_date.re"
 {
                int tz_not_found;
                TIMELIB_INIT;
@@ -11755,7 +11758,7 @@ yy941:
                TIMELIB_DEINIT;
                return TIMELIB_XMLRPC_SOAP;
        }
-#line 9854 "<stdout>"
+#line 9857 "<stdout>"
 yy942:
        YYDEBUG(942, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -12436,7 +12439,7 @@ yy1034:
 yy1035:
        YYDEBUG(1035, *YYCURSOR);
 
-#line 1067 "resource/parse_date.re"
+#line 1070 "resource/parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -12446,7 +12449,7 @@ yy1035:
                TIMELIB_DEINIT;
                return TIMELIB_ISO_DATE;
        }
-#line 10357 "<stdout>"
+#line 10360 "<stdout>"
 yy1036:
        YYDEBUG(1036, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -13229,7 +13232,7 @@ yy1115:
 yy1116:
        YYDEBUG(1116, *YYCURSOR);
 
-#line 990 "resource/parse_date.re"
+#line 993 "resource/parse_date.re"
 {
                DEBUG_OUTPUT("gnunocolon");
                TIMELIB_INIT;
@@ -13250,7 +13253,7 @@ yy1116:
                TIMELIB_DEINIT;
                return TIMELIB_GNU_NOCOLON;
        }
-#line 10995 "<stdout>"
+#line 10998 "<stdout>"
 yy1117:
        YYDEBUG(1117, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -13323,7 +13326,7 @@ yy1123:
 yy1124:
        YYDEBUG(1124, *YYCURSOR);
 
-#line 1035 "resource/parse_date.re"
+#line 1038 "resource/parse_date.re"
 {
                int tz_not_found;
                DEBUG_OUTPUT("iso8601nocolon");
@@ -13340,7 +13343,7 @@ yy1124:
                TIMELIB_DEINIT;
                return TIMELIB_ISO_NOCOLON;
        }
-#line 11069 "<stdout>"
+#line 11072 "<stdout>"
 yy1125:
        YYDEBUG(1125, *YYCURSOR);
        yyaccept = 19;
@@ -13524,7 +13527,7 @@ yy1140:
 yy1141:
        YYDEBUG(1141, *YYCURSOR);
 
-#line 927 "resource/parse_date.re"
+#line 930 "resource/parse_date.re"
 {
                timelib_ull i;
 
@@ -13547,7 +13550,7 @@ yy1141:
                TIMELIB_DEINIT;
                return TIMELIB_RELATIVE;
        }
-#line 11240 "<stdout>"
+#line 11243 "<stdout>"
 yy1142:
        YYDEBUG(1142, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -13618,7 +13621,7 @@ yy1149:
 yy1150:
        YYDEBUG(1150, *YYCURSOR);
 
-#line 915 "resource/parse_date.re"
+#line 918 "resource/parse_date.re"
 {
                DEBUG_OUTPUT("tomorrow");
                TIMELIB_INIT;
@@ -13629,7 +13632,7 @@ yy1150:
                TIMELIB_DEINIT;
                return TIMELIB_RELATIVE;
        }
-#line 11304 "<stdout>"
+#line 11307 "<stdout>"
 yy1151:
        YYDEBUG(1151, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -13642,7 +13645,7 @@ yy1152:
 yy1153:
        YYDEBUG(1153, *YYCURSOR);
 
-#line 905 "resource/parse_date.re"
+#line 908 "resource/parse_date.re"
 {
                DEBUG_OUTPUT("today");
                TIMELIB_INIT;
@@ -13651,7 +13654,7 @@ yy1153:
                TIMELIB_DEINIT;
                return TIMELIB_RELATIVE;
        }
-#line 11320 "<stdout>"
+#line 11323 "<stdout>"
 yy1154:
        YYDEBUG(1154, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -13685,7 +13688,7 @@ yy1155:
 yy1156:
        YYDEBUG(1156, *YYCURSOR);
 
-#line 896 "resource/parse_date.re"
+#line 899 "resource/parse_date.re"
 {
                DEBUG_OUTPUT("now");
                TIMELIB_INIT;
@@ -13693,7 +13696,7 @@ yy1156:
                TIMELIB_DEINIT;
                return TIMELIB_RELATIVE;
        }
-#line 11356 "<stdout>"
+#line 11359 "<stdout>"
 yy1157:
        YYDEBUG(1157, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -13751,7 +13754,7 @@ yy1164:
 yy1165:
        YYDEBUG(1165, *YYCURSOR);
 
-#line 884 "resource/parse_date.re"
+#line 887 "resource/parse_date.re"
 {
                DEBUG_OUTPUT("yesterday");
                TIMELIB_INIT;
@@ -13762,10 +13765,10 @@ yy1165:
                TIMELIB_DEINIT;
                return TIMELIB_RELATIVE;
        }
-#line 11407 "<stdout>"
+#line 11410 "<stdout>"
 }
 }
-#line 1394 "resource/parse_date.re"
+#line 1397 "resource/parse_date.re"
 
 }
 

diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
index ed20dddfc6031b5ec85c27be49c6781196a979a8..334e74f305d678ef54a395bda83bbb0780ff4ada 100644 (file)
--- a/ext/date/lib/parse_date.re
+++ b/ext/date/lib/parse_date.re
@@ -191,6 +191,7 @@ static timelib_tz_lookup_table const timelib_timezone_lookup[] = {
        { "eadt", 1,   -HOUR ( 10), "Australia/Sydney"    }, /* Eastern Australian Daylight */
        { "east", 0,   -HOUR ( 10), "Australia/Sydney"    }, /* Eastern Australian Standard */
        { "edt",  1,    HOUR (  5), "America/New_York"    }, /* Eastern Daylight */
+       { "eest", 1,    HOUR (  2), "Europe/Helsinki"     }, /* Eastern European Summer */
        { "eet",  0,   -HOUR (  2), "Europe/Bucharest"    }, /* Eastern Europe, USSR Zone 1 */
        { "est",  0,    HOUR (  5), "America/New_York"    }, /* Eastern Standard */
        { "f",    0,    HOUR (- 6), NULL                  },
@@ -217,6 +218,8 @@ static timelib_tz_lookup_table const timelib_timezone_lookup[] = {
        { "mesz", 1,   -HOUR (  1), "MET"                 }, /* Middle European Summer */
        { "met",  0,   -HOUR (  1), "MET"                 }, /* Middle European */
        { "mewt", 0,   -HOUR (  1), "MET"                 }, /* Middle European Winter */
+       { "msd",  1,    HOUR (  3), "Europe/Moscow"       }, /* Moscow Summer */
+       { "msk",  0,    HOUR (  3), "Europe/Moscow"       }, /* Moscow */
        { "mst",  0,    HOUR (  7), "America/Phoenix"     }, /* Mountain Standard */
        { "n",    0,    HOUR (  1), NULL                  },
        { "ndt",  1,    HOUR (3.5), "America/St_Johns"    }, /* Newfoundland Daylight */

diff --git a/ext/date/lib/resource/parse_date.re b/ext/date/lib/resource/parse_date.re
index ed20dddfc6031b5ec85c27be49c6781196a979a8..334e74f305d678ef54a395bda83bbb0780ff4ada 100644 (file)
--- a/ext/date/lib/resource/parse_date.re
+++ b/ext/date/lib/resource/parse_date.re
@@ -191,6 +191,7 @@ static timelib_tz_lookup_table const timelib_timezone_lookup[] = {
        { "eadt", 1,   -HOUR ( 10), "Australia/Sydney"    }, /* Eastern Australian Daylight */
        { "east", 0,   -HOUR ( 10), "Australia/Sydney"    }, /* Eastern Australian Standard */
        { "edt",  1,    HOUR (  5), "America/New_York"    }, /* Eastern Daylight */
+       { "eest", 1,    HOUR (  2), "Europe/Helsinki"     }, /* Eastern European Summer */
        { "eet",  0,   -HOUR (  2), "Europe/Bucharest"    }, /* Eastern Europe, USSR Zone 1 */
        { "est",  0,    HOUR (  5), "America/New_York"    }, /* Eastern Standard */
        { "f",    0,    HOUR (- 6), NULL                  },
@@ -217,6 +218,8 @@ static timelib_tz_lookup_table const timelib_timezone_lookup[] = {
        { "mesz", 1,   -HOUR (  1), "MET"                 }, /* Middle European Summer */
        { "met",  0,   -HOUR (  1), "MET"                 }, /* Middle European */
        { "mewt", 0,   -HOUR (  1), "MET"                 }, /* Middle European Winter */
+       { "msd",  1,    HOUR (  3), "Europe/Moscow"       }, /* Moscow Summer */
+       { "msk",  0,    HOUR (  3), "Europe/Moscow"       }, /* Moscow */
        { "mst",  0,    HOUR (  7), "America/Phoenix"     }, /* Mountain Standard */
        { "n",    0,    HOUR (  1), NULL                  },
        { "ndt",  1,    HOUR (3.5), "America/St_Johns"    }, /* Newfoundland Daylight */

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index eaa7f9c742e972bdb0fc7d559239694d35e2f5f0..751376e960f9bfb9205c96627ae9f0e7c793b7a1 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -432,7 +432,7 @@ PHP_FUNCTION(strtotime)
 }
 /* }}} */
 
-PHPAPI static void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
+PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
 {
        long hou, min, sec, mon, day, yea, dst = -1;;
        timelib_time *now;

diff --git a/ext/date/php_date.h b/ext/date/php_date.h
index d7691cf6b621cf9860e594c7d7a126367b152c74..4ea7ed554cb8dd92a1309ac931643eab83f067b4 100644 (file)
--- a/ext/date/php_date.h
+++ b/ext/date/php_date.h
@@ -64,7 +64,7 @@ ZEND_END_MODULE_GLOBALS(date)
 
 /* Backwards compability wrapper */
 signed long php_parse_date(char *string, signed long *now);
-PHPAPI static void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt);
+PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt);
 #if HAVE_STRFTIME
 #define _php_strftime php_strftime
 PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm);