| Derick Rethans 2004-11-29, 3:58 pm |
| derick Mon Nov 29 04:39:58 2004 EDT
Modified files: (Branch: PHP_5_0)
/ZendEngine2 zend_operators.c
Log:
- MF43: Revert Joe's work around a bug in GCC patch as it breaks too many things.
http://cvs.php.net/diff.php/ZendEng...=1.193.2.8&ty=u
Index: ZendEngine2/zend_operators.c
diff -u ZendEngine2/zend_operators.c:1.193.2.7 ZendEngine2/zend_operators.c:1.193.2.8
--- ZendEngine2/zend_operators.c:1.193.2.7 Wed Nov 3 18:14:31 2004
+++ ZendEngine2/zend_operators.c Mon Nov 29 04:39:57 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_operators.c,v 1.193.2.7 2004/11/03 23:14:31 derick Exp $ */
+/* $Id: zend_operators.c,v 1.193.2.8 2004/11/29 09:39:57 derick Exp $ */
#include <ctype.h>
@@ -184,15 +184,7 @@
}
-#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) { \
|