From: Antony Dovgal <tony2001@php.net>
Date: Wed, 27 Sep 2006 15:40:09 +0000 (+0000)
Subject: use if() instead of ?: and avoid possible optimization problems
X-Git-Tag: RELEASE_1_0_0RC1~1535
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3408bafa32964325b9817706fff517b042ffddd0;p=php

use if() instead of ?: and avoid possible optimization problems
---

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 297b3a629a..7c346831ea 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -221,8 +221,13 @@ ZEND_API void convert_scalar_to_number(zval *op TSRMLS_DC)
 		}																	\
 	}
 
+#define DVAL_TO_LVAL(d, l) \
+	if ((d) > LONG_MAX) { \
+		(l) = (unsigned long) (d); \
+	} else { \
+		(l) = (long) (d); \
+	}
 
-#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) {												\