From: Derick Rethans <derick@php.net>
Date: Tue, 29 Jan 2008 20:14:18 +0000 (+0000)
Subject: - That should have been ||.
X-Git-Tag: RELEASE_1_3_1~234
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99c56139c75b48914103bc2351b5422465f3f97e;p=php

- That should have been ||.
---

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 == '+') {