com php-src: renamed macro: Zend/zend_long.h Zend/zend_ types.h
| From: | Anatol Belski | Date: | Tue, 26 Aug 2014 07:55:17 +0000 |
| Subject: | com php-src: renamed macro: Zend/zend_long.h Zend/zend_ types.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81113@lists.php.net to get a copy of this message | ||
Commit: 5d062b61607e79a989899af150bc5f3aae377afe
Author: Anatol Belski <ab@php.net> Tue, 26 Aug 2014 09:55:17 +0200
Parents: baee5922c35d280d12bad645538ae445e73f7a30
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5d062b61607e79a989899af150bc5f3aae377afe
Log:
renamed macro
Changed paths:
M Zend/zend_long.h
M Zend/zend_types.h
Diff:
diff --git a/Zend/zend_long.h b/Zend/zend_long.h
index af4b468..ddfa4f3 100644
--- a/Zend/zend_long.h
+++ b/Zend/zend_long.h
@@ -26,11 +26,11 @@
/* 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;
@@ -61,7 +61,7 @@ typedef int32_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
diff --git a/Zend/zend_types.h b/Zend/zend_types.h
index 8404a2a..47f408f 100644
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -43,7 +43,7 @@
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
@@ -72,7 +72,7 @@ typedef unsigned long long zend_ulong64;
#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