[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c /ext/date/lib/resource parse_date.re /ext/date/tests bug34676.phpt

2005-10-08 Thread Derick Rethans 
derick  Sat Oct  8 10:30:16 2005 EDT

  Added files: 
/php-src/ext/date/tests bug34676.phpt 

  Modified files:  
/php-src/ext/date/lib   parse_date.c 
/php-src/ext/date/lib/resource  parse_date.re 
  Log:
  - Fixed bug #34676: missing support for strtotime(midnight) and
strtotime(noon).
  
  http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.35r2=1.36ty=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.35 
php-src/ext/date/lib/parse_date.c:1.36
--- php-src/ext/date/lib/parse_date.c:1.35  Fri Oct  7 04:05:06 2005
+++ php-src/ext/date/lib/parse_date.c   Sat Oct  8 10:30:06 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.10.dev on Fri Oct  7 09:56:07 2005 */
+/* Generated by re2c 0.9.10.dev on Sat Oct  8 16:29:08 2005 */
 #line 1 resource/parse_date.re
 /*
+--+
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: parse_date.c,v 1.35 2005/10/07 08:05:06 derick Exp $ */
+/* $Id: parse_date.c,v 1.36 2005/10/08 14:30:06 derick Exp $ */
 
 #include timelib.h
 
@@ -748,17 +748,17 @@
case 0x00:  case 0x0A:  goto yy45;
case ' ':   case ',':   case '.':   goto yy43;
case '+':   case '-':   goto yy40;
-   case '0':   goto yy8;
-   case '1':   goto yy9;
-   case '2':   goto yy10;
-   case '3':   goto yy11;
+   case '0':   goto yy9;
+   case '1':   goto yy10;
+   case '2':   goto yy11;
+   case '3':   goto yy12;
case '4':
case '5':
case '6':
case '7':
case '8':
-   case '9':   goto yy12;
-   case '@':   goto yy6;
+   case '9':   goto yy13;
+   case '@':   goto yy7;
case 'A':   goto yy22;
case 'B':
case 'C':   case 'G':
@@ -767,19 +767,19 @@
case 'Z':   goto yy41;
case 'D':   goto yy29;
case 'E':   goto yy32;
-   case 'F':   goto yy18;
-   case 'I':   goto yy13;
-   case 'J':   goto yy16;
+   case 'F':   goto yy19;
+   case 'I':   goto yy14;
+   case 'J':   goto yy17;
case 'L':   goto yy34;
-   case 'M':   goto yy20;
+   case 'M':   goto yy21;
case 'N':   goto yy28;
case 'O':   goto yy26;
case 'P':   goto yy36;
case 'S':   goto yy24;
case 'T':   goto yy31;
-   case 'V':   goto yy14;
+   case 'V':   goto yy15;
case 'W':   goto yy38;
-   case 'X':   goto yy15;
+   case 'X':   goto yy16;
case 'a':   goto yy23;
case 'b':
case 'c':   case 'g':
@@ -789,15 +789,15 @@
case 'v':   case 'x':   case 'z':   goto yy42;
case 'd':   goto yy30;
case 'e':   goto yy33;
-   case 'f':   goto yy19;
-   case 'j':   goto yy17;
+   case 'f':   goto yy20;
+   case 'j':   goto yy18;
case 'l':   goto yy35;
-   case 'm':   goto yy21;
+   case 'm':   goto yy5;
case 'n':   goto yy4;
case 'o':   goto yy27;
case 'p':   goto yy37;
case 's':   goto yy25;
-   case 't':   goto yy5;
+   case 't':   goto yy6;
case 'w':   goto yy39;
case 'y':   goto yy2;
default:goto yy47;
@@ -810,14 +810,14 @@
if(yych = 'Z') goto yy48;
goto yy3;
} else {
-   if(yych == 'e') goto yy1318;
+   if(yych == 'e') goto yy1327;
if(yych = 'z') goto yy48;
goto yy3;
}
 yy3:
YYDEBUG(3, *YYCURSOR);
 
-#line 1284 resource/parse_date.re
+#line 1296 resource/parse_date.re
 {
int tz_not_found;
DEBUG_OUTPUT(tzcorrection | tz);
@@ -851,7 +851,7 @@
if(yych = 'i') goto yy605;
goto yy48;
} else {
-   if(yych = 'o') goto yy1315;
+   if(yych = 'o') goto yy1321;
if(yych = 'z') goto yy48;
goto yy3;
}
@@ -860,6 +860,30 @@
 yy5:
YYDEBUG(5, *YYCURSOR);
yych = *++YYCURSOR;
+   if(yych = '`'){
+   if(yych = 'N'){
+   if(yych = '@') goto yy3;
+   if(yych = 'A') goto yy699;
+   goto yy48;
+   } else {
+   if(yych = 'O') goto yy702;
+   if(yych = 'Z') goto yy48;
+   goto yy3;
+   }
+   } else {
+   if(yych = 'i'){
+

[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c /ext/date/lib/resource parse_date.re /ext/date/tests bug34087.phpt

2005-08-25 Thread Derick Rethans 
derick  Thu Aug 25 05:46:33 2005 EDT

  Modified files:  
/php-src/ext/date/lib   parse_date.c 
/php-src/ext/date/lib/resource  parse_date.re 
/php-src/ext/date/tests bug34087.phpt 
  Log:
  - Fixed bug #34087 for real.
  
  http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.31r2=1.32ty=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.31 
php-src/ext/date/lib/parse_date.c:1.32
--- php-src/ext/date/lib/parse_date.c:1.31  Wed Aug 24 09:47:26 2005
+++ php-src/ext/date/lib/parse_date.c   Thu Aug 25 05:46:26 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.8.dev on Wed Aug 24 15:27:50 2005 */
+/* Generated by re2c 0.9.10.dev on Thu Aug 25 11:40:22 2005 */
 #line 1 resource/parse_date.re
 /*
+--+
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: parse_date.c,v 1.31 2005/08/24 13:47:26 derick Exp $ */
+/* $Id: parse_date.c,v 1.32 2005/08/25 09:46:26 derick Exp $ */
 
 #include timelib.h
 
@@ -773,7 +773,7 @@
 std:
s-tok = cursor;
s-len = 0;
-#line 878 resource/parse_date.re
+#line 879 resource/parse_date.re
 
 
 {
@@ -890,14 +890,14 @@
if(yych = 'Z') goto yy48;
goto yy3;
} else {
-   if(yych == 'e') goto yy1308;
+   if(yych == 'e') goto yy1312;
if(yych = 'z') goto yy48;
goto yy3;
}
 yy3:
YYDEBUG(3, *YYCURSOR);
 
-#line 1360 resource/parse_date.re
+#line 1361 resource/parse_date.re
 {
int tz_not_found;
DEBUG_OUTPUT(tzcorrection | tz);
@@ -931,7 +931,7 @@
if(yych = 'i') goto yy605;
goto yy48;
} else {
-   if(yych = 'o') goto yy1305;
+   if(yych = 'o') goto yy1309;
if(yych = 'z') goto yy48;
goto yy3;
}
@@ -979,21 +979,21 @@
case 'H':   case 'h':   goto yy470;
case 'U':   case 'u':   goto yy471;
case 'W':   case 'w':   goto yy472;
-   case 'o':   goto yy1293;
+   case 'o':   goto yy1297;
default:goto yy3;
}
 yy6:
YYDEBUG(6, *YYCURSOR);
yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
-   if(yych == '-') goto yy1289;
+   if(yych == '-') goto yy1293;
if(yych = '0') goto yy7;
-   if(yych = '9') goto yy1290;
+   if(yych = '9') goto yy1294;
goto yy7;
 yy7:
YYDEBUG(7, *YYCURSOR);
 
-#line 1426 resource/parse_date.re
+#line 1427 resource/parse_date.re
 {
 /* printf(unexpected character: #%d, %c , *s-tok, *s-tok); */
s-errors++;
@@ -1031,9 +1031,9 @@
case 'o':   case 's':
case 't':   case 'w':   case 'y':   goto yy776;
case '-':   goto yy783;
-   case '.':   goto yy1255;
+   case '.':   goto yy1259;
case '/':   goto yy782;
-   case '0':   goto yy1288;
+   case '0':   goto yy1292;
case '1':
case '2':
case '3':
@@ -1042,8 +1042,8 @@
case '6':
case '7':
case '8':
-   case '9':   goto yy1287;
-   case ':':   goto yy1256;
+   case '9':   goto yy1291;
+   case ':':   goto yy1260;
default:goto yy7;
}
 yy9:
@@ -1081,14 +1081,14 @@
case '/':   goto yy782;
case '0':
case '1':
-   case '2':   goto yy1287;
+   case '2':   goto yy1291;
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
-   case '9':   goto yy1254;
+   case '9':   goto yy1258;
case ':':   goto yy795;
default:goto yy7;
}
@@ -1128,13 +1128,13 @@
case '0':
case '1':
case '2':
-   case '3':   goto yy1254;
+   case '3':   goto yy1258;
case '4':
case '5':
case '6':
case '7':
case '8':
-   case '9':   goto yy1246;
+   case '9':   goto yy1250;
case ':':   goto yy795;
default:goto yy7;
}
@@ -1172,7 +1172,7 @@
case '.':   goto yy786;
case '/':   goto yy782;
case '0':
-   case '1':   goto yy1246;
+   case '1':   goto yy1250;
case '2':
case '3':
case '4':
@@ -1922,7 +1922,7 @@
 yy44:
YYDEBUG(44, *YYCURSOR);
 
-#line 1415 resource/parse_date.re
+#line 1416 resource/parse_date.re
 {
goto std;
}
@@ -1934,7 +1934,7 @@
 yy46:
YYDEBUG(46, *YYCURSOR);
 
-#line 1420 resource/parse_date.re
+#line 1421 resource/parse_date.re
 {

[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c /ext/date/lib/resource parse_date.re

2005-07-01 Thread Derick Rethans 
derick  Fri Jul  1 03:18:43 2005 EDT

  Modified files:  
/php-src/ext/date/lib   parse_date.c 
/php-src/ext/date/lib/resource  parse_date.re 
  Log:
  - parse_date.c is a generated file, updated parse_date.re and regenerated
parse_date.c.
  
  http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.18r2=1.19ty=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.18 
php-src/ext/date/lib/parse_date.c:1.19
--- php-src/ext/date/lib/parse_date.c:1.18  Thu Jun 30 19:03:36 2005
+++ php-src/ext/date/lib/parse_date.c   Fri Jul  1 03:18:42 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.8.dev on Wed Jun 29 20:46:25 2005 */
+/* Generated by re2c 0.9.8.dev on Fri Jul  1 09:16:07 2005 */
 #line 1 parse_date.re
 /*
+--+
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: parse_date.c,v 1.18 2005/06/30 23:03:36 fmk Exp $ */
+/* $Id: parse_date.c,v 1.19 2005/07/01 07:18:42 derick Exp $ */
 
 #include timelib.h
 
@@ -768,7 +768,7 @@
 std:
s-tok = cursor;
s-len = 0;
-#line 873 parse_date.re
+#line 872 parse_date.re
 
 
 {
@@ -807,7 +807,7 @@
  0,   0,   0,   0,   0,   0,   0,   0, 
};
 
-#line 812 stdout
+#line 811 stdout
 {
YYCTYPE yych;
unsigned int yyaccept;
@@ -885,14 +885,14 @@
 yy3:
YYDEBUG(3, *YYCURSOR);
 
-#line 1311 parse_date.re
+#line 1310 parse_date.re
 {
TIMELIB_INIT;
s-time-z = timelib_get_zone((char **) ptr, s-time-dst, 
s-time);
TIMELIB_DEINIT;
return TIMELIB_TIMEZONE;
}
-#line 890 stdout
+#line 889 stdout
 yy4:
YYDEBUG(4, *YYCURSOR);
yych = *++YYCURSOR;
@@ -963,12 +963,12 @@
 yy7:
YYDEBUG(7, *YYCURSOR);
 
-#line 1371 parse_date.re
+#line 1370 parse_date.re
 {
 /* printf(unexpected character: #%d, %c\n, *s-tok, *s-tok); */
goto std;
}
-#line 958 stdout
+#line 957 stdout
 yy8:
YYDEBUG(8, *YYCURSOR);
yyaccept = 0;
@@ -1703,11 +1703,11 @@
 yy44:
YYDEBUG(44, *YYCURSOR);
 
-#line 1360 parse_date.re
+#line 1359 parse_date.re
 {
goto std;
}
-#line 1618 stdout
+#line 1617 stdout
 yy45:
YYDEBUG(45, *YYCURSOR);
++YYCURSOR;
@@ -1715,12 +1715,12 @@
 yy46:
YYDEBUG(46, *YYCURSOR);
 
-#line 1365 parse_date.re
+#line 1364 parse_date.re
 {
s-pos = cursor; s-line++;
goto std;
}
-#line 1627 stdout
+#line 1626 stdout
 yy47:
YYDEBUG(47, *YYCURSOR);
yych = *++YYCURSOR;
@@ -2073,7 +2073,7 @@
 yy81:
YYDEBUG(81, *YYCURSOR);
 
-#line 1344 parse_date.re
+#line 1343 parse_date.re
 {
timelib_ull i;
 
@@ -2088,7 +2088,7 @@
TIMELIB_DEINIT;
return TIMELIB_RELATIVE;
}
-#line 1924 stdout
+#line 1923 stdout
 yy82:
YYDEBUG(82, *YYCURSOR);
++YYCURSOR;
@@ -2711,11 +2711,11 @@
 yy148:
YYDEBUG(148, *YYCURSOR);
 
-#line 1306 parse_date.re
+#line 1305 parse_date.re
 {
goto std;
}
-#line 2417 stdout
+#line 2416 stdout
 yy149:
YYDEBUG(149, *YYCURSOR);
yych = *++YYCURSOR;
@@ -2757,7 +2757,7 @@
 yy155:
YYDEBUG(155, *YYCURSOR);
 
-#line 1290 parse_date.re
+#line 1289 parse_date.re
 {
const timelib_relunit* relunit;
 
@@ -2772,7 +2772,7 @@
TIMELIB_DEINIT;
return TIMELIB_RELATIVE;
}
-#line 2460 stdout
+#line 2459 stdout
 yy156:
YYDEBUG(156, *YYCURSOR);
yyaccept = 1;
@@ -3156,7 +3156,7 @@
 yy188:
YYDEBUG(188, *YYCURSOR);
 
-#line 1274 parse_date.re
+#line 1273 parse_date.re
 {
timelib_sll i;
 
@@ -3171,7 +3171,7 @@
TIMELIB_DEINIT;
return TIMELIB_RELATIVE;
}
-#line 2791 stdout
+#line 2790 stdout
 yy189:
YYDEBUG(189, *YYCURSOR);
++YYCURSOR;
@@ -5344,7 +5344,7 @@
 yy391:
YYDEBUG(391, *YYCURSOR);
 
-#line 1104 parse_date.re
+#line 1103 parse_date.re
 {
TIMELIB_INIT;
TIMELIB_HAVE_DATE();
@@ -5355,7 +5355,7 @@
TIMELIB_DEINIT;
return TIMELIB_DATE_NO_DAY;
}
-#line 4565 stdout
+#line 4564 stdout
 yy392:
YYDEBUG(392, *YYCURSOR);
yych = *++YYCURSOR;
@@ -5406,7 +5406,7 @@
 yy397:
YYDEBUG(397, *YYCURSOR);
 
-#line 1128 parse_date.re
+#line 1127 parse_date.re
 {
TIMELIB_INIT;
TIMELIB_HAVE_DATE();
@@ -5417,7 +5417,7 @@
TIMELIB_DEINIT;
return TIMELIB_DATE_TEXT;
}
-#line 4615 stdout
+#line 4614 stdout
 yy398:
YYDEBUG(398, *YYCURSOR);
yych = *++YYCURSOR;
@@ -5506,7 +5506,7 @@
 yy409:
YYDEBUG(409, *YYCURSOR);
 
-#line 1319 parse_date.re
+#line 1318 parse_date.re
 {

[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c /ext/date/lib/resource parse_date.re /ext/date/tests format-negative-timestamp.phpt

2005-06-29 Thread Derick Rethans 
derick  Wed Jun 29 15:07:06 2005 EDT

  Added files: 
/php-src/ext/date/tests format-negative-timestamp.phpt 

  Modified files:  
/php-src/ext/date/lib   parse_date.c 
/php-src/ext/date/lib/resource  parse_date.re 
  Log:
  - Added support for negative timestamps with the @number format. (Patch by
Nuno Lopes)
  
  http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.16r2=1.17ty=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.16 
php-src/ext/date/lib/parse_date.c:1.17
--- php-src/ext/date/lib/parse_date.c:1.16  Tue Jun 28 14:05:58 2005
+++ php-src/ext/date/lib/parse_date.c   Wed Jun 29 15:07:04 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.8.dev on Tue Jun 28 20:03:29 2005 */
+/* Generated by re2c 0.9.8.dev on Wed Jun 29 20:46:25 2005 */
 #line 1 parse_date.re
 /*
+--+
@@ -18,9 +18,9 @@
+--+
  */
 
-/* $Id: parse_date.c,v 1.16 2005/06/28 18:05:58 derick Exp $ */
+/* $Id: parse_date.c,v 1.17 2005/06/29 19:07:04 derick Exp $ */
 
-#include timelib_config.h
+#include timelib.h
 
 #include stdio.h
 
@@ -33,8 +33,6 @@
 #include strings.h
 #endif
 
-#include timelib.h
-
 #if defined(_MSC_VER)
 # define strcasecmp stricmp
 # define strtoll(s, f, b) _atoi64(s)
@@ -771,7 +769,7 @@
 std:
s-tok = cursor;
s-len = 0;
-#line 875 parse_date.re
+#line 873 parse_date.re
 
 
 {
@@ -810,7 +808,7 @@
  0,   0,   0,   0,   0,   0,   0,   0, 
};
 
-#line 814 stdout
+#line 812 stdout
 {
YYCTYPE yych;
unsigned int yyaccept;
@@ -883,19 +881,19 @@
 yy2:
YYDEBUG(2, *YYCURSOR);
++YYCURSOR;
-   if((yych = *YYCURSOR) == 'e')   goto yy1156;
+   if((yych = *YYCURSOR) == 'e')   goto yy1157;
goto yy49;
 yy3:
YYDEBUG(3, *YYCURSOR);
 
-#line 1313 parse_date.re
+#line 1311 parse_date.re
 {
TIMELIB_INIT;
s-time-z = timelib_get_zone((char **) ptr, s-time-dst, 
s-time);
TIMELIB_DEINIT;
return TIMELIB_TIMEZONE;
}
-#line 892 stdout
+#line 890 stdout
 yy4:
YYDEBUG(4, *YYCURSOR);
yych = *++YYCURSOR;
@@ -914,7 +912,7 @@
goto yy49;
} else {
if(yych = 'i') goto yy473;
-   if(yych == 'o') goto yy1153;
+   if(yych == 'o') goto yy1154;
goto yy49;
}
}
@@ -943,7 +941,7 @@
} else {
if(yych = 'h') goto yy344;
if(yych = 'n') goto yy49;
-   goto yy1141;
+   goto yy1142;
}
} else {
if(yych = 'u'){
@@ -957,14 +955,16 @@
}
 yy6:
YYDEBUG(6, *YYCURSOR);
-   ++YYCURSOR;
-   if((yych = *YYCURSOR) = '0')   goto yy7;
-   if(yych = '9') goto yy1138;
+   yyaccept = 0;
+   yych = *(YYMARKER = ++YYCURSOR);
+   if(yych == '-') goto yy1138;
+   if(yych = '0') goto yy7;
+   if(yych = '9') goto yy1139;
goto yy7;
 yy7:
YYDEBUG(7, *YYCURSOR);
 
-#line 1373 parse_date.re
+#line 1371 parse_date.re
 {
 /* printf(unexpected character: #%d, %c\n, *s-tok, *s-tok); */
goto std;
@@ -1704,7 +1704,7 @@
 yy44:
YYDEBUG(44, *YYCURSOR);
 
-#line 1362 parse_date.re
+#line 1360 parse_date.re
 {
goto std;
}
@@ -1716,7 +1716,7 @@
 yy46:
YYDEBUG(46, *YYCURSOR);
 
-#line 1367 parse_date.re
+#line 1365 parse_date.re
 {
s-pos = cursor; s-line++;
goto std;
@@ -2074,7 +2074,7 @@
 yy81:
YYDEBUG(81, *YYCURSOR);
 
-#line 1346 parse_date.re
+#line 1344 parse_date.re
 {
timelib_ull i;
 
@@ -2712,7 +2712,7 @@
 yy148:
YYDEBUG(148, *YYCURSOR);
 
-#line 1308 parse_date.re
+#line 1306 parse_date.re
 {
goto std;
}
@@ -2758,7 +2758,7 @@
 yy155:
YYDEBUG(155, *YYCURSOR);
 
-#line 1292 parse_date.re
+#line 1290 parse_date.re
 {
const timelib_relunit* relunit;
 
@@ -3157,7 +3157,7 @@
 yy188:
YYDEBUG(188, *YYCURSOR);
 
-#line 1276 parse_date.re
+#line 1274 parse_date.re
 {
timelib_sll i;
 
@@ -5345,7 +5345,7 @@
 yy391:
YYDEBUG(391, *YYCURSOR);
 
-#line 1106 parse_date.re
+#line 1104 parse_date.re
 {
TIMELIB_INIT;
TIMELIB_HAVE_DATE();
@@ -5407,7 +5407,7 @@
 yy397:
YYDEBUG(397, *YYCURSOR);
 
-#line 1130 parse_date.re
+#line 1128 parse_date.re
 {
TIMELIB_INIT;
TIMELIB_HAVE_DATE();
@@ -5507,7 +5507,7 @@
 yy409:
YYDEBUG(409, *YYCURSOR);
 
-#line 1321 parse_date.re
+#line 1319 parse_date.re

[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c /ext/date/lib/resource parse_date.re

2005-06-16 Thread Derick Rethans 
derick  Thu Jun 16 09:30:27 2005 EDT

  Modified files:  
/php-src/ext/date/lib   parse_date.c 
/php-src/ext/date/lib/resource  parse_date.re 
  Log:
  - Fixed a regression with last saturday
  
  
http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.7r2=1.8ty=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.7 
php-src/ext/date/lib/parse_date.c:1.8
--- php-src/ext/date/lib/parse_date.c:1.7   Wed Jun 15 07:01:04 2005
+++ php-src/ext/date/lib/parse_date.c   Thu Jun 16 09:30:25 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.8.dev on Wed Jun 15 12:56:03 2005 */
+/* Generated by re2c 0.9.8.dev on Thu Jun 16 15:24:58 2005 */
 #line 1 parse_date.re
 /*
+--+
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: parse_date.c,v 1.7 2005/06/15 11:01:04 derick Exp $ */
+/* $Id: parse_date.c,v 1.8 2005/06/16 13:30:25 derick Exp $ */
 
 #include stdlib.h
 #include stdio.h
@@ -528,11 +528,11 @@
return 0;
 }
 
-static long timelib_lookup_relative_text(char **ptr)
+static timelib_sll timelib_lookup_relative_text(char **ptr)
 {
char *word;
char *begin = *ptr, *end;
-   long  value = 0;
+   timelib_sll  value = 0;
const timelib_lookup_table *tp;
 
while ((**ptr = 'A'  **ptr = 'Z') || (**ptr = 'a'  **ptr = 
'z')) {
@@ -552,7 +552,7 @@
return value;
 }
 
-static long timelib_get_relative_text(char **ptr)
+static timelib_sll timelib_get_relative_text(char **ptr)
 {
while (**ptr == ' ' || **ptr == '-' || **ptr == '/') {
++*ptr;
@@ -623,7 +623,7 @@
return value;
 }
 
-static void timelib_set_relative(char **ptr, timelib_ull amount, Scanner *s)
+static void timelib_set_relative(char **ptr, timelib_sll amount, Scanner *s)
 {
const timelib_relunit* relunit;
 
@@ -3128,7 +3128,7 @@
 
 #line 1226 parse_date.re
 {
-   long i;
+   timelib_sll i;
 
TIMELIB_INIT;
TIMELIB_HAVE_RELATIVE();
http://cvs.php.net/diff.php/php-src/ext/date/lib/resource/parse_date.re?r1=1.6r2=1.7ty=u
Index: php-src/ext/date/lib/resource/parse_date.re
diff -u php-src/ext/date/lib/resource/parse_date.re:1.6 
php-src/ext/date/lib/resource/parse_date.re:1.7
--- php-src/ext/date/lib/resource/parse_date.re:1.6 Wed Jun 15 07:01:07 2005
+++ php-src/ext/date/lib/resource/parse_date.re Thu Jun 16 09:30:26 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: parse_date.re,v 1.6 2005/06/15 11:01:07 derick Exp $ */
+/* $Id: parse_date.re,v 1.7 2005/06/16 13:30:26 derick Exp $ */
 
 #include stdlib.h
 #include stdio.h
@@ -526,11 +526,11 @@
return 0;
 }
 
-static long timelib_lookup_relative_text(char **ptr)
+static timelib_sll timelib_lookup_relative_text(char **ptr)
 {
char *word;
char *begin = *ptr, *end;
-   long  value = 0;
+   timelib_sll  value = 0;
const timelib_lookup_table *tp;
 
while ((**ptr = 'A'  **ptr = 'Z') || (**ptr = 'a'  **ptr = 
'z')) {
@@ -550,7 +550,7 @@
return value;
 }
 
-static long timelib_get_relative_text(char **ptr)
+static timelib_sll timelib_get_relative_text(char **ptr)
 {
while (**ptr == ' ' || **ptr == '-' || **ptr == '/') {
++*ptr;
@@ -621,7 +621,7 @@
return value;
 }
 
-static void timelib_set_relative(char **ptr, timelib_ull amount, Scanner *s)
+static void timelib_set_relative(char **ptr, timelib_sll amount, Scanner *s)
 {
const timelib_relunit* relunit;
 
@@ -1224,7 +1224,7 @@
 
relativetext
{
-   long i;
+   timelib_sll i;
 
TIMELIB_INIT;
TIMELIB_HAVE_RELATIVE();

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php