summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2008-01-29 20:14:18 +0000
committerDerick Rethans <derick@php.net>2008-01-29 20:14:18 +0000
commit99c56139c75b48914103bc2351b5422465f3f97e (patch)
treeeeccc519e9f8b6e007a119897ad67b4537f74bfd
parent81f2dc39bd6631a3bff431303031bcf2e1c4a677 (diff)
downloadphp-git-99c56139c75b48914103bc2351b5422465f3f97e.tar.gz
- That should have been ||.
-rw-r--r--ext/date/lib/parse_date.c4
-rw-r--r--ext/date/lib/parse_date.re2
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index 7db740b27b..4a47575289 100644
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.12.1 on Tue Jan 29 20:58:48 2008 */
+/* Generated by re2c 0.12.1 on Tue Jan 29 21:13:35 2008 */
#line 1 "ext/date/lib/parse_date.re"
/*
+----------------------------------------------------------------------+
@@ -757,7 +757,7 @@ static long timelib_get_zone(char **ptr, int *dst, timelib_time *t, int *tz_not_
while (**ptr == ' ' || **ptr == '\t' || **ptr == '(') {
++*ptr;
}
- if ((*ptr)[0] == 'G' && (*ptr)[1] == 'M' && (*ptr)[2] == 'T' && ((*ptr)[3] == '+' | (*ptr)[3] == '-')) {
+ if ((*ptr)[0] == 'G' && (*ptr)[1] == 'M' && (*ptr)[2] == 'T' && ((*ptr)[3] == '+' || (*ptr)[3] == '-')) {
*ptr += 3;
}
if (**ptr == '+') {
diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
index dfd78da569..faff1bbd17 100644
--- a/ext/date/lib/parse_date.re
+++ b/ext/date/lib/parse_date.re
@@ -755,7 +755,7 @@ static long timelib_get_zone(char **ptr, int *dst, timelib_time *t, int *tz_not_
while (**ptr == ' ' || **ptr == '\t' || **ptr == '(') {
++*ptr;
}
- if ((*ptr)[0] == 'G' && (*ptr)[1] == 'M' && (*ptr)[2] == 'T' && ((*ptr)[3] == '+' | (*ptr)[3] == '-')) {
+ if ((*ptr)[0] == 'G' && (*ptr)[1] == 'M' && (*ptr)[2] == 'T' && ((*ptr)[3] == '+' || (*ptr)[3] == '-')) {
*ptr += 3;
}
if (**ptr == '+') {