From 79c9dc75de490430a81ecb9134c2c79b3d8fc0a1 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 2 Feb 2015 09:17:52 +0100 Subject: [PATCH] rely on macros from stdint for int constants on 64 bit 32 bit ones are already in use --- Zend/zend_long.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Zend/zend_long.h b/Zend/zend_long.h index 2644faa8bd9..1acd2cfb087 100644 --- a/Zend/zend_long.h +++ b/Zend/zend_long.h @@ -37,13 +37,8 @@ typedef int64_t zend_off_t; # define ZEND_LONG_MAX INT64_MAX # define ZEND_LONG_MIN INT64_MIN # define ZEND_ULONG_MAX UINT64_MAX -# ifdef _WIN64 -# define Z_L(i) i##i64 -# define Z_UL(i) i##Ui64 -# else -# define Z_L(i) i##LL -# define Z_UL(i) i##ULL -# endif +# define Z_L(i) INT64_C(i) +# define Z_UL(i) UINT64_C(i) # define SIZEOF_ZEND_LONG 8 #else typedef int32_t zend_long;