summaryrefslogtreecommitdiff
path: root/Zend/zend_operators.c
diff options
context:
space:
mode:
Diffstat (limited to 'Zend/zend_operators.c')
-rw-r--r--Zend/zend_operators.c10
1 files changed, 1 insertions, 9 deletions
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) { \