/* This is the heart of the whole int64 enablement in zval. */
#if defined(__X86_64__) || defined(__LP64__) || defined(_LP64) || defined(_WIN64)
-# define ZEND_ENABLE_INT64 1
+# define ZEND_ENABLE_ZVAL_LONG64 1
#endif
/* Integer types or the old bad long. */
-#ifdef ZEND_ENABLE_INT64
+#ifdef ZEND_ENABLE_ZVAL_LONG64
typedef int64_t zend_long;
typedef uint64_t zend_ulong;
typedef int64_t zend_off_t;
/* conversion macros */
#define ZEND_LTOA_BUF_LEN 65
-#ifdef ZEND_ENABLE_INT64
+#ifdef ZEND_ENABLE_ZVAL_LONG64
# define ZEND_LONG_FMT "%" PRId64
# define ZEND_ULONG_FMT "%" PRIu64
# define ZEND_LONG_FMT_SPEC PRId64
typedef unsigned char zend_bool;
typedef unsigned char zend_uchar;
-#ifdef ZEND_ENABLE_INT64
+#ifdef ZEND_ENABLE_ZVAL_LONG64
# ifdef ZEND_WIN32
# define ZEND_SIZE_MAX _UI64_MAX
# else
#endif
/* XXX this won't work on X32 platform */
-#ifdef ZEND_ENABLE_INT64
+#ifdef ZEND_ENABLE_ZVAL_LONG64
typedef int64_t zend_intptr_t;
typedef uint64_t zend_uintptr_t;
#else