]> granicus.if.org Git - php/commitdiff
WIN64 support
authorDmitry Stogov <dmitry@php.net>
Mon, 23 Apr 2007 10:21:24 +0000 (10:21 +0000)
committerDmitry Stogov <dmitry@php.net>
Mon, 23 Apr 2007 10:21:24 +0000 (10:21 +0000)
Zend/zend_operators.c

index 8b142e62868472a16ef21756947c17fb86c06197..6c29cd42baa97c06bed3ee985282843232f7a7e8 100644 (file)
@@ -233,13 +233,21 @@ ZEND_API int convert_scalar_to_number(zval *op TSRMLS_DC)
                }                                                                                                                                       \
        }
 
-#define DVAL_TO_LVAL(d, l) \
+#ifdef _WIN64
+# define DVAL_TO_LVAL(d, l) \
+       if ((d) > LONG_MAX) { \
+               (l) = (long)(unsigned long)(__int64) (d); \
+       } else { \
+               (l) = (long) (d); \
+       }
+#else
+# define DVAL_TO_LVAL(d, l) \
        if ((d) > LONG_MAX) { \
                (l) = (unsigned long) (d); \
        } else { \
                (l) = (long) (d); \
        }
-
+#endif
 
 #define zendi_convert_to_long(op, holder, result)                                      \
        if (op == result) {                                                                                             \