From: Derick Rethans <derick@php.net>
Date: Mon, 29 Nov 2004 09:32:15 +0000 (+0000)
Subject: - MFH: Revert Joe's work around a bug in GCC patch as it breaks too many things.
X-Git-Tag: RELEASE_0_2~609
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebca90f075a4a804c67a0b1c975ad346c91eddbf;p=php

- MFH: Revert Joe's work around a bug in GCC patch as it breaks too many things.
---

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 8a26e5d411..cf63461668 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -184,15 +184,7 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC)
 	}
 
 
-#define DVAL_TO_LVAL(d, l) do {                        \
-       if ((d) >= LONG_MAX) {                   \
-               l = LONG_MAX;                   \
-       } else if ((d) < LONG_MIN) {            \
-               l = LONG_MIN;                   \
-       } else {                                \
-               l = (d);                        \
-       }                                       \
-} while (0)
+#define DVAL_TO_LVAL(d, l) (l) = (d) > LONG_MAX ? (unsigned long) (d) : (long) (d)
 
 #define zendi_convert_to_long(op, holder, result)					\
 	if (op == result || op->refcount == 0) {												\