cvs: ZendEngine2(PHP_5_2) / zend_operators.c
| From: | Antony Dovgal | Date: | Wed, 27 Sep 2006 15:40:19 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_2) / zend_operators.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-5274@lists.php.net to get a copy of this message | ||
tony2001 Wed Sep 27 15:40:19 2006 UTC
Modified files: (Branch: PHP_5_2)
/ZendEngine2 zend_operators.c
Log:
MFH: use if() instead of ?:
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.c?r1=1.208.2.4.2.8&r2=1.208.2.4.2.9&diff_format=u
Index: ZendEngine2/zend_operators.c
diff -u ZendEngine2/zend_operators.c:1.208.2.4.2.8 ZendEngine2/zend_operators.c:1.208.2.4.2.9
--- ZendEngine2/zend_operators.c:1.208.2.4.2.8 Tue Jul 18 09:06:33 2006
+++ ZendEngine2/zend_operators.c Wed Sep 27 15:40:19 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_operators.c,v 1.208.2.4.2.8 2006/07/18 09:06:33 dmitry Exp $ */
+/* $Id: zend_operators.c,v 1.208.2.4.2.9 2006/09/27 15:40:19 tony2001 Exp $ */
#include <ctype.h>
@@ -186,8 +186,13 @@
} \
}
+#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) { \