master renamings phase 5

8 files changed, 14 insertions, 14 deletions

diff --git a/Zend/zend.h b/Zend/zend.h
index e377005288..0e8de14cb4 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -273,14 +273,14 @@ char *alloca ();
 #define LONG_MIN (- LONG_MAX - 1)
 #endif
 
-#if SIZEOF_ZEND_INT == 4
+#if SIZEOF_ZEND_LONG == 4
 #define MAX_LENGTH_OF_LONG 11
 static const char long_min_digits[] = "2147483648";
-#elif SIZEOF_ZEND_INT == 8
+#elif SIZEOF_ZEND_LONG == 8
 #define MAX_LENGTH_OF_LONG 20
 static const char long_min_digits[] = "9223372036854775808";
 #else
-#error "Unknown SIZEOF_ZEND_INT"
+#error "Unknown SIZEOF_ZEND_LONG"
 #endif
 
 #define MAX_LENGTH_OF_DOUBLE 32
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index af33b3e007..1b4d05bcaf 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -128,7 +128,7 @@ typedef struct _zend_try_catch_element {
 	uint32_t finally_end;
 } zend_try_catch_element;
 
-#if SIZEOF_ZEND_INT == 8
+#if SIZEOF_ZEND_LONG == 8
 # ifdef _WIN32
 #  define THIS_HASHVAL 6385726429Ui64
 # else
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
index 42bacc5c16..5508a40bdf 100644
--- a/Zend/zend_hash.h
+++ b/Zend/zend_hash.h
@@ -258,7 +258,7 @@ static inline int _zend_handle_numeric_str(const char *key, size_t length, zend_
 	if ((*end != '\0') /* not a null terminated string */
 	 || (*tmp == '0' && length > 1) /* numbers with leading zeros */
 	 || (end - tmp > MAX_LENGTH_OF_LONG - 1) /* number too long */
-	 || (SIZEOF_ZEND_INT == 4 &&
+	 || (SIZEOF_ZEND_LONG == 4 &&
 	     end - tmp == MAX_LENGTH_OF_LONG - 1 &&
 	     *tmp > '2')) { /* overflow */
 		return 0;
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 33dc6eed24..3b10615513 100644
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -3314,7 +3314,7 @@ yy200:
 		--len;
 	}
 
-	if (len < SIZEOF_ZEND_INT * 8) {
+	if (len < SIZEOF_ZEND_LONG * 8) {
 		if (len == 0) {
 			ZVAL_LONG(zendlval, 0);
 		} else {
@@ -3349,7 +3349,7 @@ yy203:
 		len--;
 	}
 
-	if (len < SIZEOF_ZEND_INT * 2 || (len == SIZEOF_ZEND_INT * 2 && *hex <= '7')) {
+	if (len < SIZEOF_ZEND_LONG * 2 || (len == SIZEOF_ZEND_LONG * 2 && *hex <= '7')) {
 		if (len == 0) {
 			ZVAL_LONG(zendlval, 0);
 		} else {
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index f4f327b7b6..66fa0cc7bf 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1521,7 +1521,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
 		--len;
 	}
 
-	if (len < SIZEOF_ZEND_INT * 8) {
+	if (len < SIZEOF_ZEND_LONG * 8) {
 		if (len == 0) {
 			ZVAL_LONG(zendlval, 0);
 		} else {
@@ -1562,7 +1562,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
 		len--;
 	}
 
-	if (len < SIZEOF_ZEND_INT * 2 || (len == SIZEOF_ZEND_INT * 2 && *hex <= '7')) {
+	if (len < SIZEOF_ZEND_LONG * 2 || (len == SIZEOF_ZEND_LONG * 2 && *hex <= '7')) {
 		if (len == 0) {
 			ZVAL_LONG(zendlval, 0);
 		} else {
diff --git a/Zend/zend_long.h b/Zend/zend_long.h
index 34441c6e45..9ac7c8e4b8 100644
--- a/Zend/zend_long.h
+++ b/Zend/zend_long.h
@@ -59,7 +59,7 @@ typedef off_t zend_off_t;
 #   error Cant enable 64 bit integers on non 64 bit platform
 #  endif
 # endif
-# define SIZEOF_ZEND_INT 8
+# define SIZEOF_ZEND_LONG 8
 #else
 typedef long zend_long;
 typedef unsigned long zend_ulong;
@@ -69,7 +69,7 @@ typedef long zend_off_t;
 # define ZEND_ULONG_MAX ULONG_MAX
 # define Z_I(i) i##L
 # define Z_UL(i) i##UL
-# define SIZEOF_ZEND_INT SIZEOF_LONG
+# define SIZEOF_ZEND_LONG SIZEOF_LONG
 #endif
 
 
diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h
index 71223ad117..3a1a091b0a 100644
--- a/Zend/zend_multiply.h
+++ b/Zend/zend_multiply.h
@@ -81,7 +81,7 @@
 	}																\
 } while (0)
 
-#elif SIZEOF_ZEND_INT == 4 && defined(HAVE_ZEND_LONG64)
+#elif SIZEOF_ZEND_LONG == 4 && defined(HAVE_ZEND_LONG64)
 
 #define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do {	\
 	zend_long64 __result = (zend_long64) (a) * (zend_long64) (b);	\
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 7e6e8b9772..def3db0cf2 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -73,7 +73,7 @@ END_EXTERN_C()
 
 #if ZEND_DVAL_TO_LVAL_CAST_OK
 # define zend_dval_to_lval(d) ((zend_long) (d))
-#elif SIZEOF_ZEND_INT == 4
+#elif SIZEOF_ZEND_LONG == 4
 static zend_always_inline zend_long zend_dval_to_lval(double d)
 {
 	if (d > ZEND_LONG_MAX || d < ZEND_LONG_MIN) {
@@ -202,7 +202,7 @@ check_digits:
 				dp_or_e = -1;
 				goto process_double;
 			}
-		} else if (!(digits < SIZEOF_ZEND_INT * 2 || (digits == SIZEOF_ZEND_INT * 2 && ptr[-digits] <= '7'))) {
+		} else if (!(digits < SIZEOF_ZEND_LONG * 2 || (digits == SIZEOF_ZEND_LONG * 2 && ptr[-digits] <= '7'))) {
 			if (dval) {
 				local_dval = zend_hex_strtod(str, &ptr);
 			}