diff options
Diffstat (limited to 'Zend/zend_multiply.h')
| -rw-r--r-- | Zend/zend_multiply.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h index 158be22007..ad874ba039 100644 --- a/Zend/zend_multiply.h +++ b/Zend/zend_multiply.h @@ -84,10 +84,10 @@ } \ } while (0) -#elif SIZEOF_ZEND_LONG == 4 && defined(HAVE_ZEND_LONG64) +#elif SIZEOF_ZEND_LONG == 4 #define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do { \ - zend_long64 __result = (zend_long64) (a) * (zend_long64) (b); \ + int64_t __result = (int64_t) (a) * (int64_t) (b); \ if (__result > ZEND_LONG_MAX || __result < ZEND_LONG_MIN) { \ (dval) = (double) __result; \ (usedval) = 1; \ @@ -206,13 +206,13 @@ static zend_always_inline size_t zend_safe_address(size_t nmemb, size_t size, si return res; } -#elif SIZEOF_SIZE_T == 4 && defined(HAVE_ZEND_LONG64) +#elif SIZEOF_SIZE_T == 4 static zend_always_inline size_t zend_safe_address(size_t nmemb, size_t size, size_t offset, int *overflow) { - zend_ulong64 res = (zend_ulong64)nmemb * (zend_ulong64)size + (zend_ulong64)offset; + uint64_t res = (uint64_t) nmemb * (uint64_t) size + (uint64_t) offset; - if (UNEXPECTED(res > (zend_ulong64)0xFFFFFFFFL)) { + if (UNEXPECTED(res > UINT64_C(0xFFFFFFFF))) { *overflow = 1; return 0; } |