master renames phase 6

diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index 0d47d1c926955d34b490451a660743c4b08074cc..77a10044463947b3216e389a57e4c144ccde0516 100644 (file)
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -29,18 +29,18 @@
 #include "zend_types.h"
 
 #ifndef ZEND_MM_ALIGNMENT
-# define ZEND_MM_ALIGNMENT Z_I(8)
-# define ZEND_MM_ALIGNMENT_LOG2 Z_I(3)
-#elif ZEND_MM_ALIGNMENT < Z_I(4)
+# define ZEND_MM_ALIGNMENT Z_L(8)
+# define ZEND_MM_ALIGNMENT_LOG2 Z_L(3)
+#elif ZEND_MM_ALIGNMENT < Z_L(4)
 # undef ZEND_MM_ALIGNMENT
 # undef ZEND_MM_ALIGNMENT_LOG2
-# define ZEND_MM_ALIGNMENT Z_I(4)
-# define ZEND_MM_ALIGNMENT_LOG2 Z_I(2)
+# define ZEND_MM_ALIGNMENT Z_L(4)
+# define ZEND_MM_ALIGNMENT_LOG2 Z_L(2)
 #endif
 
-#define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT-Z_I(1))
+#define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT-Z_L(1))
 
-#define ZEND_MM_ALIGNED_SIZE(size)     (((size) + ZEND_MM_ALIGNMENT - Z_I(1)) & ZEND_MM_ALIGNMENT_MASK)
+#define ZEND_MM_ALIGNED_SIZE(size)     (((size) + ZEND_MM_ALIGNMENT - Z_L(1)) & ZEND_MM_ALIGNMENT_MASK)
 
 typedef struct _zend_leak_info {
        void *addr;

diff --git a/Zend/zend_long.h b/Zend/zend_long.h
index 9ac7c8e4b81edadbed9972eb131e0a374997aca3..a5ac2157f8524d0cbd5b09b460a2269bf8947d31 100644 (file)
--- a/Zend/zend_long.h
+++ b/Zend/zend_long.h
@@ -40,7 +40,7 @@ typedef __int64 zend_off_t;
 #   define ZEND_LONG_MAX _I64_MAX
 #   define ZEND_LONG_MIN _I64_MIN
 #   define ZEND_ULONG_MAX _UI64_MAX
-#   define Z_I(i) i##i64
+#   define Z_L(i) i##i64
 #   define Z_UL(i) i##Ui64
 #  else
 #   error Cant enable 64 bit integers on non 64 bit platform
@@ -53,7 +53,7 @@ typedef off_t zend_off_t;
 #   define ZEND_LONG_MAX INT64_MAX
 #   define ZEND_LONG_MIN INT64_MIN
 #   define ZEND_ULONG_MAX UINT64_MAX
-#   define Z_I(i) i##LL
+#   define Z_L(i) i##LL
 #   define Z_UL(i) i##ULL
 #  else
 #   error Cant enable 64 bit integers on non 64 bit platform
@@ -67,7 +67,7 @@ typedef long zend_off_t;
 # define ZEND_LONG_MAX LONG_MAX
 # define ZEND_LONG_MIN LONG_MIN
 # define ZEND_ULONG_MAX ULONG_MAX
-# define Z_I(i) i##L
+# define Z_L(i) i##L
 # define Z_UL(i) i##UL
 # define SIZEOF_ZEND_LONG SIZEOF_LONG
 #endif

diff --git a/Zend/zend_qsort.c b/Zend/zend_qsort.c
index 16d513e93c1aa26f8ed64785893ba81e7306e575..a27a3c281fea98875252293b6f7b4324e48228f6 100644 (file)
--- a/Zend/zend_qsort.c
+++ b/Zend/zend_qsort.c
@@ -74,7 +74,7 @@ ZEND_API void zend_qsort_r(void *base, size_t nmemb, size_t siz, compare_r_func_
                end   = end_stack[loop];
 
                while (begin < end) {
-                       offset = (end - begin) >> Z_I(1);
+                       offset = (end - begin) >> Z_L(1);
                        _zend_qsort_swap(begin, begin + (offset - (offset % siz)), siz);
 
                        seg1 = begin + siz;

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index de7c8c7023be897c7febc8b4070078be250b6be8..f6a3fffac8c6d36b5b48408c661950445c7abc56 100644 (file)
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -2130,7 +2130,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_server_version)(const MYSQLND_CONN_DATA *
        p += 1; /* consume the dot */
        patch = ZEND_STRTOL(p, &p, 10);
 
-       return (zend_ulong)(major * Z_I(10000) + (zend_ulong)(minor * Z_I(100) + patch));
+       return (zend_ulong)(major * Z_L(10000) + (zend_ulong)(minor * Z_L(100) + patch));
 }
 /* }}} */
 

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 584b87d68e56246b87aee763e3777534bce7a562..d2ecd039f1e7887810450649257d43780c110d29 100755 (executable)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -2882,7 +2882,7 @@ PHP_FUNCTION(openssl_csr_sign)
 {
        zval * zcert = NULL, *zcsr, *zpkey, *args = NULL;
        zend_long num_days;
-       zend_long serial = Z_I(0);
+       zend_long serial = Z_L(0);
        X509 * cert = NULL, *new_cert = NULL;
        X509_REQ * csr;
        EVP_PKEY * key = NULL, *priv_key = NULL;

diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
index fe23e5fac236db121522eddb2593f2db8b3fce74..e56fae34ba351599a4f0a9ac08b0a5a8ca567db4 100644 (file)
--- a/ext/pdo_pgsql/pgsql_driver.c
+++ b/ext/pdo_pgsql/pgsql_driver.c
@@ -309,7 +309,7 @@ static zend_long pgsql_handle_doer(pdo_dbh_t *dbh, const char *sql, zend_long sq
        if (qs == PGRES_COMMAND_OK) {
                ZEND_ATOL(ret, PQcmdTuples(res));
        } else {
-               ret = Z_I(0);
+               ret = Z_L(0);
        }
        PQclear(res);
 

diff --git a/ext/pspell/pspell.c b/ext/pspell/pspell.c
index ff97306ecf74df97f5a0973f311dc16bda2d0cb4..c7994ea73f4bc2328b0b90721a44a949b6603052 100644 (file)
--- a/ext/pspell/pspell.c
+++ b/ext/pspell/pspell.c
@@ -265,7 +265,7 @@ static PHP_FUNCTION(pspell_new)
 {
        char *language, *spelling = NULL, *jargon = NULL, *encoding = NULL;
        int language_len, spelling_len = 0, jargon_len = 0, encoding_len = 0;
-       zend_long mode = Z_I(0),  speed = Z_I(0);
+       zend_long mode = Z_L(0),  speed = Z_L(0);
        int argc = ZEND_NUM_ARGS();
        zval *ind;
 
@@ -362,7 +362,7 @@ static PHP_FUNCTION(pspell_new_personal)
 {
        char *personal, *language, *spelling = NULL, *jargon = NULL, *encoding = NULL;
        int personal_len, language_len, spelling_len = 0, jargon_len = 0, encoding_len = 0;
-       zend_long mode = Z_I(0),  speed = Z_I(0);
+       zend_long mode = Z_L(0),  speed = Z_L(0);
        int argc = ZEND_NUM_ARGS();
        zval *ind;
 

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 2663b404ac8ee97ae80637d3b4fc90e9b7b93715..7079c645384e2f129aee2b08925349d05802a2d2 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2841,7 +2841,7 @@ PHP_FUNCTION(array_pad)
 
        /* Populate the pads array */
        num_pads = pad_size_abs - input_size;
-       if (num_pads > Z_I(1048576)) {
+       if (num_pads > Z_L(1048576)) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "You may only pad up to 1048576 elements at a time");
                zval_dtor(return_value);
                RETURN_FALSE;

diff --git a/ext/standard/html.c b/ext/standard/html.c
index a9e5fbfe9dddab5ddb0d873969e56e4dc9d76048..04a4ea6c76fa46d15a0c70a440158a9f79c7d092 100644 (file)
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -813,7 +813,7 @@ static inline int process_numeric_entity(const char **buf, unsigned *code_point)
 
        /* many more are invalid, but that depends on whether it's HTML
         * (and which version) or XML. */
-       if (code_l > Z_I(0x10FFFF))
+       if (code_l > Z_L(0x10FFFF))
                return FAILURE;
 
        if (code_point != NULL)