summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2008-01-29 20:15:44 +0000
committerDerick Rethans <derick@php.net>2008-01-29 20:15:44 +0000
commit6d6ae90d03cdd6340717d472d354a822cb363c5c (patch)
treebc98d1f80d17f73b547f11d7cecd0c3772eddfb9
parentc3505930f0629912c38aed3c13609c39e06b3980 (diff)
downloadphp-git-6d6ae90d03cdd6340717d472d354a822cb363c5c.tar.gz
- MF53: 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 77499a2d64..751d6794e0 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 21:07:53 2008 */
+/* Generated by re2c 0.12.1 on Tue Jan 29 21:14:49 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 == '+') {