fixed several long vs zend_long casts

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 81c05965781e324a455f89ab13e0ddd844d95275..e2f9846479681ec3aa54fa1ed02a54fdb309c849 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1331,7 +1331,7 @@ static char *zend_get_function_declaration(zend_function *fptr TSRMLS_DC) /* {{{
                                                ++idx;
                                                while (op < end) {
                                                        if ((op->opcode == ZEND_RECV || op->opcode == ZEND_RECV_INIT)
-                                                                       && op->op1.num == (long)idx)
+                                                                       && op->op1.num == (zend_ulong)idx)
                                                        {
                                                                precv = op;
                                                        }

diff --git a/Zend/zend_long.h b/Zend/zend_long.h
index ddfa4f39f1cf18324c07f2b481d9d66be90ea4cf..b30759a73257a588d7df04e37a8ec5ac8e0161f7 100644 (file)
--- a/Zend/zend_long.h
+++ b/Zend/zend_long.h
@@ -29,7 +29,7 @@
 # define ZEND_ENABLE_ZVAL_LONG64 1
 #endif
 
-/* Integer types or the old bad long. */
+/* Integer types. */
 #ifdef ZEND_ENABLE_ZVAL_LONG64
 typedef int64_t zend_long;
 typedef uint64_t zend_ulong;
@@ -58,7 +58,7 @@ typedef int32_t zend_off_t;
 #endif
 
 
-/* conversion macros */
+/* Conversion macros. */
 #define ZEND_LTOA_BUF_LEN 65
 
 #ifdef ZEND_ENABLE_ZVAL_LONG64

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index e041eef12dc5ab5723a701ad0c0023d203fc9a13..de6bd3b6f1bde2b8e586fec04df0fe306aa0a287 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1410,10 +1410,10 @@ static size_t curl_progress(void *clientp, double dltotal, double dlnow, double
 
                        ZVAL_RES(&argv[0], ch->res);
                        Z_ADDREF(argv[0]);
-                       ZVAL_LONG(&argv[1], (long)dltotal);
-                       ZVAL_LONG(&argv[2], (long)dlnow);
-                       ZVAL_LONG(&argv[3], (long)ultotal);
-                       ZVAL_LONG(&argv[4], (long)ulnow);
+                       ZVAL_LONG(&argv[1], (zend_long)dltotal);
+                       ZVAL_LONG(&argv[2], (zend_long)dlnow);
+                       ZVAL_LONG(&argv[3], (zend_long)ultotal);
+                       ZVAL_LONG(&argv[4], (zend_long)ulnow);
 
                        fci.size = sizeof(fci);
                        fci.function_table = EG(function_table);
@@ -2558,9 +2558,9 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue TSRMLS_
                                        } else {
                                                error = curl_formadd(&first, &last,
                                                                                         CURLFORM_COPYNAME, string_key->val,
-                                                                                        CURLFORM_NAMELENGTH, (long)string_key->len,
+                                                                                        CURLFORM_NAMELENGTH, (zend_long)string_key->len,
                                                                                         CURLFORM_COPYCONTENTS, postval,
-                                                                                        CURLFORM_CONTENTSLENGTH, (long)Z_STRLEN_P(current),
+                                                                                        CURLFORM_CONTENTSLENGTH, (zend_long)Z_STRLEN_P(current),
                                                                                         CURLFORM_END);
                                        }
 

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index c187e9da53a25904010c97c9fabc6a50489b02d9..94470ca919e1ce6c11151c979dace4b9fdd2db76 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -4821,7 +4821,7 @@ static HashTable *date_object_get_properties_period(zval *object TSRMLS_DC) /* {
        zend_hash_str_update(props, "interval", sizeof("interval")-1, &zv);
        
        /* converted to larger type (int->long); must check when unserializing */
-       ZVAL_LONG(&zv, (long) period_obj->recurrences);
+       ZVAL_LONG(&zv, (zend_long) period_obj->recurrences);
        zend_hash_str_update(props, "recurrences", sizeof("recurrences")-1, &zv);
 
        ZVAL_BOOL(&zv, period_obj->include_start_date);

diff --git a/ext/intl/converter/converter.c b/ext/intl/converter/converter.c
index aabb9c34005065b0040efa64d8c29a5ee31c1a4c..24e9789fc02b564ba243f204bf03dc5d72b924f5 100644 (file)
--- a/ext/intl/converter/converter.c
+++ b/ext/intl/converter/converter.c
@@ -45,7 +45,7 @@ static zend_object_handlers  php_converter_object_handlers;
 
 #define CONV_GET(pzv)  (Z_INTL_CONVERTER_P((pzv)))
 #define THROW_UFAILURE(obj, fname, error) php_converter_throw_failure(obj, error TSRMLS_CC, \
-                                          fname "() returned error %ld: %s", (long)error, u_errorName(error))
+                                          fname "() returned error " ZEND_LONG_FMT ": %s", (zend_long)error, u_errorName(error))
 
 /* {{{ php_converter_throw_failure */
 static inline void php_converter_throw_failure(php_converter_object *objval, UErrorCode error TSRMLS_DC, const char *format, ...) {

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index dc5a2120ba785751667cfda9ac9c5e225c7ac7e9..8939e9934af39b1cca1d76218a59ffb4e2ca3fb6 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1299,7 +1299,7 @@ PHP_FUNCTION(mysql_thread_id)
                ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, -1, "MySQL-Link", le_link, le_plink);
        }
 
-       RETURN_LONG((long) mysql_thread_id(mysql->conn));
+       RETURN_LONG((zend_long) mysql_thread_id(mysql->conn));
 }
 /* }}} */
 
@@ -1837,7 +1837,7 @@ PHP_FUNCTION(mysql_affected_rows)
        }
 
        /* conversion from int64 to long happing here */
-       RETURN_LONG((long)mysql_affected_rows(mysql->conn));
+       RETURN_LONG((zend_long)mysql_affected_rows(mysql->conn));
 }
 /* }}} */
 
@@ -1918,7 +1918,7 @@ PHP_FUNCTION(mysql_insert_id)
        }
 
        /* conversion from int64 to long happing here */
-       RETURN_LONG((long)mysql_insert_id(mysql->conn));
+       RETURN_LONG((zend_long)mysql_insert_id(mysql->conn));
 }
 /* }}} */
 
@@ -2040,7 +2040,7 @@ PHP_FUNCTION(mysql_num_rows)
        ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, result, -1, "MySQL result", le_result);
 
        /* conversion from int64 to long happing here */
-       RETURN_LONG((long) mysql_num_rows(mysql_result));
+       RETURN_LONG((zend_long) mysql_num_rows(mysql_result));
 }
 /* }}} */
 

diff --git a/ext/odbc/birdstep.c b/ext/odbc/birdstep.c
index d9c0f36320d47109ed92fa5bd5c164a44b9cd4e0..e23d8beaa588ed10b7cb06d5f24a97439923b890 100644 (file)
--- a/ext/odbc/birdstep.c
+++ b/ext/odbc/birdstep.c
@@ -539,7 +539,7 @@ l1:
                        if ( res->values[indx].valtype == SQL_LONGVARCHAR ) {
                                RETURN_STRING(res->values[indx].value,TRUE);
                        } else {
-                               RETURN_LONG((long)res->values[indx].value);
+                               RETURN_LONG((zend_long)res->values[indx].value);
                        }
                default:
                        if ( res->values[indx].value != NULL ) {

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 415588ff0bc2b16a3112702f046800379fb2cee4..9c4e11f3ae416913137ff1d3f1f1e20f4deae0dd 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -2928,7 +2928,7 @@ PHP_FUNCTION(odbc_autocommit)
                        odbc_sql_error(conn, SQL_NULL_HSTMT, "Get commit status");
                        RETURN_FALSE;
                }
-               RETVAL_LONG((long)status);
+               RETVAL_LONG((zend_long)status);
        }
 }
 /* }}} */

diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 30ffb309b367a1ba8158164f1cf5f8e78232a136..0445edb2c9d6df19ed7ae759a2de8a7063e86368 100644 (file)
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -548,7 +548,7 @@ PHP_FUNCTION(pcntl_fork)
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error %d", errno);
        }
        
-       RETURN_LONG((long) id);
+       RETURN_LONG((zend_long) id);
 }
 /* }}} */
 

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index eeed36427a8a5e8e66ee766d5fd2ce1b2dbd610a..6e49b5528044f99ea7f4f1417c16601bb1308267 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -2523,7 +2523,7 @@ static void php_pgsql_get_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_typ
                        } else
 #endif
                        {
-                               RETURN_LONG((long)oid);
+                               RETURN_LONG((zend_long)oid);
                        }
                        break;
                default:

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 94cb3fb2738334ac358bad89d18e72c06e89b710..36e1588fe2f5d426bd881f60b08f54fa0749ea9f 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -111,7 +111,7 @@ ZEND_DECLARE_MODULE_GLOBALS(reflection)
 
 /* Class constants */
 #define REGISTER_REFLECTION_CLASS_CONST_LONG(class_name, const_name, value)                                        \
-       zend_declare_class_constant_long(reflection_ ## class_name ## _ptr, const_name, sizeof(const_name)-1, (long)value TSRMLS_CC);
+       zend_declare_class_constant_long(reflection_ ## class_name ## _ptr, const_name, sizeof(const_name)-1, (zend_long)value TSRMLS_CC);
 
 /* {{{ Smart string functions */
 typedef struct _string {
@@ -668,7 +668,7 @@ static zend_op* _get_recv_op(zend_op_array *op_array, uint32_t offset)
        ++offset;
        while (op < end) {
                if ((op->opcode == ZEND_RECV || op->opcode == ZEND_RECV_INIT 
-                   || op->opcode == ZEND_RECV_VARIADIC) && op->op1.num == (long)offset)
+                   || op->opcode == ZEND_RECV_VARIADIC) && op->op1.num == (zend_long)offset)
                {
                        return op;
                }

diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c
index b9e2499308b558f73009fdb9f867c9cfea753802..ec66c9d0e052a5a1c3c14711cf3f6db055683b74 100644 (file)
--- a/ext/sockets/conversions.c
+++ b/ext/sockets/conversions.c
@@ -390,7 +390,7 @@ static void from_zval_write_uint32(const zval *arr_value, char *field, ser_conte
                return;
        }
 
-       if (sizeof(long) > sizeof(uint32_t) && (lval < 0 || lval > 0xFFFFFFFF)) {
+       if (sizeof(zend_long) > sizeof(uint32_t) && (lval < 0 || lval > 0xFFFFFFFF)) {
                do_from_zval_err(ctx, "%s", "given PHP integer is out of bounds "
                                "for an unsigned 32-bit integer");
                return;
@@ -468,13 +468,13 @@ static void from_zval_write_uid_t(const zval *arr_value, char *field, ser_contex
 
        /* uid_t can be signed or unsigned (generally unsigned) */
        if ((uid_t)-1 > (uid_t)0) {
-               if (sizeof(long) > sizeof(uid_t) && (lval < 0 || (uid_t)lval != lval)) {
+               if (sizeof(zend_long) > sizeof(uid_t) && (lval < 0 || (uid_t)lval != lval)) {
                        do_from_zval_err(ctx, "%s", "given PHP integer is out of bounds "
                                        "for a uid_t value");
                        return;
                }
        } else {
-               if (sizeof(long) > sizeof(uid_t) && (uid_t)lval != lval) {
+               if (sizeof(zend_long) > sizeof(uid_t) && (uid_t)lval != lval) {
                        do_from_zval_err(ctx, "%s", "given PHP integer is out of bounds "
                                        "for a uid_t value");
                        return;
@@ -490,49 +490,49 @@ void to_zval_read_int(const char *data, zval *zv, res_context *ctx)
        int ival;
        memcpy(&ival, data, sizeof(ival));
 
-       ZVAL_LONG(zv, (long)ival);
+       ZVAL_LONG(zv, (zend_long)ival);
 }
 static void to_zval_read_unsigned(const char *data, zval *zv, res_context *ctx)
 {
        unsigned ival;
        memcpy(&ival, data, sizeof(ival));
 
-       ZVAL_LONG(zv, (long)ival);
+       ZVAL_LONG(zv, (zend_long)ival);
 }
 static void to_zval_read_net_uint16(const char *data, zval *zv, res_context *ctx)
 {
        uint16_t ival;
        memcpy(&ival, data, sizeof(ival));
 
-       ZVAL_LONG(zv, (long)ntohs(ival));
+       ZVAL_LONG(zv, (zend_long)ntohs(ival));
 }
 static void to_zval_read_uint32(const char *data, zval *zv, res_context *ctx)
 {
        uint32_t ival;
        memcpy(&ival, data, sizeof(ival));
 
-       ZVAL_LONG(zv, (long)ival);
+       ZVAL_LONG(zv, (zend_long)ival);
 }
 static void to_zval_read_sa_family(const char *data, zval *zv, res_context *ctx)
 {
        sa_family_t ival;
        memcpy(&ival, data, sizeof(ival));
 
-       ZVAL_LONG(zv, (long)ival);
+       ZVAL_LONG(zv, (zend_long)ival);
 }
 static void to_zval_read_pid_t(const char *data, zval *zv, res_context *ctx)
 {
        pid_t ival;
        memcpy(&ival, data, sizeof(ival));
 
-       ZVAL_LONG(zv, (long)ival);
+       ZVAL_LONG(zv, (zend_long)ival);
 }
 static void to_zval_read_uid_t(const char *data, zval *zv, res_context *ctx)
 {
        uid_t ival;
        memcpy(&ival, data, sizeof(ival));
 
-       ZVAL_LONG(zv, (long)ival);
+       ZVAL_LONG(zv, (zend_long)ival);
 }
 
 /* CONVERSIONS for sockaddr */

diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c
index 018605fb75d9f45db4b76abd18ab98a37d781046..91867d99e3c985ec0c9631522ca0496368b46423 100644 (file)
--- a/ext/sockets/sendrecvmsg.c
+++ b/ext/sockets/sendrecvmsg.c
@@ -198,7 +198,7 @@ PHP_FUNCTION(socket_sendmsg)
                zend_llist_destroy(allocations);
                efree(allocations);
 
-               RETURN_LONG((long)res);
+               RETURN_LONG((zend_long)res);
        } else {
                PHP_SOCKET_ERROR(php_sock, "error in sendmsg", errno);
                RETURN_FALSE;
@@ -308,7 +308,7 @@ PHP_FUNCTION(socket_cmsg_space)
                return;
        }
 
-       RETURN_LONG((long)CMSG_SPACE(entry->size + n * entry->var_el_size));
+       RETURN_LONG((zend_long)CMSG_SPACE(entry->size + n * entry->var_el_size));
 }
 
 #if HAVE_IPV6

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index e8b598b1e77771b55c649c799b1d822be773a6ae..6d58732d40791a2452b285b5eb345a5503df137b 100644 (file)
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -1856,7 +1856,7 @@ PHP_FUNCTION(socket_get_option)
                                RETURN_FALSE;
                        }
                        if (php_add4_to_if_index(&if_addr, php_sock, &if_index TSRMLS_CC) == SUCCESS) {
-                               RETURN_LONG((long) if_index);
+                               RETURN_LONG((zend_long) if_index);
                        } else {
                                RETURN_FALSE;
                        }

diff --git a/ext/standard/head.c b/ext/standard/head.c
index b53740563d1422f1809fea3419cd742e5c901378..47c4d282cb1a16ab0cd15ad889fe902382bc2811 100644 (file)
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -138,7 +138,7 @@ PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, t
                        strlcat(cookie, dt->val, len + 100);
                        zend_string_free(dt);
 
-                       snprintf(tsdelta, sizeof(tsdelta), "%li", (long) difftime(expires, time(NULL)));
+                       snprintf(tsdelta, sizeof(tsdelta), ZEND_LONG_FMT, (zend_long) difftime(expires, time(NULL)));
                        strlcat(cookie, COOKIE_MAX_AGE, len + 100);
                        strlcat(cookie, tsdelta, len + 100);
                }

diff --git a/ext/standard/image.c b/ext/standard/image.c
index 79e26c63109a3e1acad7993aab4738844ed8ba6a..5488a80d3fad3d1f2982fdd918e45e1cfe353341 100644 (file)
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -425,13 +425,13 @@ static unsigned int php_next_marker(php_stream * stream, int last_marker, int co
  * skip over a variable-length block; assumes proper length marker */
 static int php_skip_variable(php_stream * stream TSRMLS_DC)
 {
-       off_t length = ((unsigned int)php_read2(stream TSRMLS_CC));
+       zend_off_t length = ((unsigned int)php_read2(stream TSRMLS_CC));
 
        if (length < 2) {
                return 0;
        }
        length = length - 2;
-       php_stream_seek(stream, (long)length, SEEK_CUR);
+       php_stream_seek(stream, (zend_long)length, SEEK_CUR);
        return 1;
 }
 /* }}} */
@@ -453,7 +453,7 @@ static int php_read_APP(php_stream * stream, unsigned int marker, zval *info TSR
 
        buffer = emalloc(length);
 
-       if (php_stream_read(stream, buffer, (long) length) <= 0) {
+       if (php_stream_read(stream, buffer, (zend_long) length) <= 0) {
                efree(buffer);
                return 0;
        }

diff --git a/ext/standard/lcg.c b/ext/standard/lcg.c
index 311173a13715b08cb1538a07cf37e8d298f03d83..051dfc61c8c90ac1dbeaefbe67c62724ffc69de0 100644 (file)
--- a/ext/standard/lcg.c
+++ b/ext/standard/lcg.c
@@ -83,9 +83,9 @@ static void lcg_seed(TSRMLS_D) /* {{{ */
                LCG(s1) = 1;
        }
 #ifdef ZTS
-       LCG(s2) = (long) tsrm_thread_id();
+       LCG(s2) = (zend_long) tsrm_thread_id();
 #else
-       LCG(s2) = (long) getpid();
+       LCG(s2) = (zend_long) getpid();
 #endif
 
        /* Add entropy to s2 by calling gettimeofday() again */

diff --git a/ext/standard/link.c b/ext/standard/link.c
index 0f889a9e6a942185cfb33962c3e491dae893e6ab..b808e728eb78896e0a17ef8c8b4056e545bd51ce 100644 (file)
--- a/ext/standard/link.c
+++ b/ext/standard/link.c
@@ -87,7 +87,7 @@ PHP_FUNCTION(linkinfo)
        char *link;
        char *dirname;
        int link_len, dir_len;
-       struct stat sb;
+       zend_stat_t sb;
        int ret;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p", &link, &link_len) == FAILURE) {
@@ -110,7 +110,7 @@ PHP_FUNCTION(linkinfo)
        }
 
        efree(dirname);
-       RETURN_LONG((long) sb.st_dev);
+       RETURN_LONG((zend_long) sb.st_dev);
 }
 /* }}} */
 

diff --git a/ext/standard/link_win32.c b/ext/standard/link_win32.c
index 07466d2966fea37b65e48603238e17398a30f2fa..8c111ac6bc9d7c734a513b1c9a6f8ce9b66f1354 100644 (file)
--- a/ext/standard/link_win32.c
+++ b/ext/standard/link_win32.c
@@ -98,10 +98,10 @@ PHP_FUNCTION(linkinfo)
        ret = VCWD_STAT(link, &sb);
        if (ret == -1) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
-               RETURN_LONG(-1L);
+               RETURN_LONG(Z_L(-1));
        }
 
-       RETURN_LONG((long) sb.st_dev);
+       RETURN_LONG((zend_long) sb.st_dev);
 }
 /* }}} */
 

diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 9d35326ef070cd82aa730b7a920b26fc4e997cd8..a3eaec413f13e0c27b939eb03346717358a4c16d 100644 (file)
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -1396,11 +1396,11 @@ static PHP_FUNCTION(tidy_get_config)
                                break;
 
                        case TidyInteger:
-                               add_assoc_long(return_value, opt_name, (long)opt_value);
+                               add_assoc_long(return_value, opt_name, (zend_long)opt_value);
                                break;
 
                        case TidyBoolean:
-                               add_assoc_bool(return_value, opt_name, (long)opt_value);
+                               add_assoc_bool(return_value, opt_name, (zend_long)opt_value);
                                break;
                }
        }
@@ -1529,7 +1529,7 @@ static PHP_FUNCTION(tidy_getopt)
                        return;
 
                case TidyInteger:
-                       RETURN_LONG((long)optval);
+                       RETURN_LONG((zend_long)optval);
                        break;
 
                case TidyBoolean:

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 6581d4c58517eb4946b0b37ba07f612337d3022e..5dea203bca54b5df04ef5306322ba9977ae520a5 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -1439,7 +1439,7 @@ PHP_FUNCTION(xml_get_error_code)
 
        ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
 
-       RETURN_LONG((long)XML_GetErrorCode(parser->parser));
+       RETURN_LONG((zend_long)XML_GetErrorCode(parser->parser));
 }
 /* }}} */
 

diff --git a/ext/xmlreader/php_xmlreader.h b/ext/xmlreader/php_xmlreader.h
index 63653213fe3ef8f5d0856ee841d6f4bed79682a6..4107396d390b712e321fc4b5069d091f3a687fd4 100644 (file)
--- a/ext/xmlreader/php_xmlreader.h
+++ b/ext/xmlreader/php_xmlreader.h
@@ -51,7 +51,7 @@ PHP_MSHUTDOWN_FUNCTION(xmlreader);
 PHP_MINFO_FUNCTION(xmlreader);
 
 #define REGISTER_XMLREADER_CLASS_CONST_LONG(const_name, value) \
-       zend_declare_class_constant_long(xmlreader_class_entry, const_name, sizeof(const_name)-1, (long)value TSRMLS_CC);
+       zend_declare_class_constant_long(xmlreader_class_entry, const_name, sizeof(const_name)-1, (zend_long)value TSRMLS_CC);
 
 #ifdef ZTS
 #define XMLREADER_G(v) TSRMG(xmlreader_globals_id, zend_xmlreader_globals *, v)

diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index ec9d1b0202617efd3f507443444043dcabad613d..4a25abc8f3fd88badff558df177ff3fa94b66030 100644 (file)
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -373,7 +373,7 @@ static int php_zip_parse_options(zval *options, zend_long *remove_all_path, char
 
 /* {{{ REGISTER_ZIP_CLASS_CONST_LONG */
 #define REGISTER_ZIP_CLASS_CONST_LONG(const_name, value) \
-           zend_declare_class_constant_long(zip_class_entry, const_name, sizeof(const_name)-1, (long)value TSRMLS_CC);
+           zend_declare_class_constant_long(zip_class_entry, const_name, sizeof(const_name)-1, (zend_long)value TSRMLS_CC);
 /* }}} */
 
 /* {{{ ZIP_FROM_OBJECT */
@@ -393,12 +393,12 @@ static int php_zip_parse_options(zval *options, zend_long *remove_all_path, char
        { \
                array_init(return_value); \
                add_ascii_assoc_string(return_value, "name", (char *)(sb)->name); \
-               add_ascii_assoc_long(return_value, "index", (long) (sb)->index); \
-               add_ascii_assoc_long(return_value, "crc", (long) (sb)->crc); \
-               add_ascii_assoc_long(return_value, "size", (long) (sb)->size); \
-               add_ascii_assoc_long(return_value, "mtime", (long) (sb)->mtime); \
-               add_ascii_assoc_long(return_value, "comp_size", (long) (sb)->comp_size); \
-               add_ascii_assoc_long(return_value, "comp_method", (long) (sb)->comp_method); \
+               add_ascii_assoc_long(return_value, "index", (zend_long) (sb)->index); \
+               add_ascii_assoc_long(return_value, "crc", (zend_long) (sb)->crc); \
+               add_ascii_assoc_long(return_value, "size", (zend_long) (sb)->size); \
+               add_ascii_assoc_long(return_value, "mtime", (zend_long) (sb)->mtime); \
+               add_ascii_assoc_long(return_value, "comp_size", (zend_long) (sb)->comp_size); \
+               add_ascii_assoc_long(return_value, "comp_method", (zend_long) (sb)->comp_method); \
        }
 /* }}} */
 
@@ -1124,7 +1124,7 @@ static PHP_NAMED_FUNCTION(zif_zip_open)
        rsrc_int->za = zip_open(resolved_path, 0, &err);
        if (rsrc_int->za == NULL) {
                efree(rsrc_int);
-               RETURN_LONG((long)err);
+               RETURN_LONG((zend_long)err);
        }
 
        rsrc_int->index_current = 0;

diff --git a/main/output.c b/main/output.c
index 1a6f6e5bd8637c015e8d4c163af6dc41302491ce..2bfd2485a4eb4fe8b8437aacc9568cb729b3a96e 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -973,7 +973,7 @@ static inline php_output_handler_status_t php_output_handler_op(php_output_handl
                        zval retval, ob_data, ob_mode;
 
                        ZVAL_STRINGL(&ob_data, handler->buffer.data, handler->buffer.used);
-                       ZVAL_LONG(&ob_mode, (long) context->op);
+                       ZVAL_LONG(&ob_mode, (zend_long) context->op);
                        zend_fcall_info_argn(&handler->func.user->fci TSRMLS_CC, 2, &ob_data, &ob_mode);
 
 #define PHP_OUTPUT_USER_SUCCESS(retval) ((Z_TYPE(retval) != IS_UNDEF) && !(Z_TYPE(retval) == IS_FALSE))

diff --git a/main/php.h b/main/php.h
index 8ee83e424d78845e31a074254d6fa0af2e450675..11a8a64401d5c305880ad08f8407ac5a074bb4d4 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -434,7 +434,7 @@ END_EXTERN_C()
 #else /* ! (CRAY || __arm) */
 
 #define XtOffset(p_type, field) \
-    ((long) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
+    ((zend_long) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
 
 #endif /* !CRAY */
 #endif /* ! XtOffset */

diff --git a/main/streams/userspace.c b/main/streams/userspace.c
index 1a20fad1fe9cac61b8c73a70d92e7b6fa2ba69f0..aac7769eb82970f1d3ea16159d580beb03565f83 100644 (file)
--- a/main/streams/userspace.c
+++ b/main/streams/userspace.c
@@ -987,7 +987,7 @@ static int php_userstreamop_set_option(php_stream *stream, int option, int value
                case PHP_STREAM_TRUNCATE_SET_SIZE: {
                        ptrdiff_t new_size = *(ptrdiff_t*) ptrparam;
                        if (new_size >= 0 && new_size <= (ptrdiff_t)LONG_MAX) {
-                               ZVAL_LONG(&args[0], (long)new_size);
+                               ZVAL_LONG(&args[0], (zend_long)new_size);
                                call_result = call_user_function_ex(NULL,
                                                                Z_ISUNDEF(us->object)? NULL : &us->object,
                                                                &func_name,

diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c
index aaea793133711d1851adc0122176e22ff1f8629f..f23b330a8f58646ab2479c898d422d55fc5e65dc 100644 (file)
--- a/sapi/cgi/fastcgi.c
+++ b/sapi/cgi/fastcgi.c
@@ -643,7 +643,7 @@ int fcgi_listen(const char *path, int backlog)
                if (namedPipe == INVALID_HANDLE_VALUE) {
                        return -1;
                }
-               listen_socket = _open_osfhandle((long)namedPipe, 0);
+               listen_socket = _open_osfhandle((intptr_t)namedPipe, 0);
                if (!is_initialized) {
                        fcgi_init();
                }
@@ -724,7 +724,7 @@ int fcgi_listen(const char *path, int backlog)
 
 #ifdef _WIN32
        if (tcp) {
-               listen_socket = _open_osfhandle((long)listen_socket, 0);
+               listen_socket = _open_osfhandle((intptr_t)listen_socket, 0);
        }
 #else
        fcgi_setup_signals();