cvs: ZendEngine2 / zend_operators.c

derick          Mon Nov 29 04:32:16 2004 EDT

  Modified files:              
    /ZendEngine2        zend_operators.c 
  Log:
  - MFH: Revert Joe's work around a bug in GCC patch as it breaks too many 
things.
  
http://cvs.php.net/diff.php/ZendEngine2/zend_operators.c?r1=1.202&r2=1.203&ty=u
Index: ZendEngine2/zend_operators.c
diff -u ZendEngine2/zend_operators.c:1.202 ZendEngine2/zend_operators.c:1.203
--- ZendEngine2/zend_operators.c:1.202  Wed Nov  3 18:13:32 2004
+++ ZendEngine2/zend_operators.c        Mon Nov 29 04:32:15 2004
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_operators.c,v 1.202 2004/11/03 23:13:32 derick Exp $ */
+/* $Id: zend_operators.c,v 1.203 2004/11/29 09:32:15 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 || op->refcount == 0) {                                
                                                                \

-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php