- 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 8a26e5d411264fa450495ecf5db85a3f00db03f9..cf63461668b2aa72811a5062ae5f65dfdd92d33f 100644 (file)
--- 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) {                                                                                                \