diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-08-26 14:23:01 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-08-26 14:23:01 +0400 |
| commit | d17790b35ed503a7f289c5730ceea3e46345b45a (patch) | |
| tree | 0c431071526b030846addfc4c717cbb15a861fff /ext/mysql/php_mysql.c | |
| parent | 055b632e7d0464a019d7a251cf1e9da9982c8f0e (diff) | |
| parent | 202e8db1dc8e1203039327d81ce6fd82c1c2d909 (diff) | |
| download | php-git-d17790b35ed503a7f289c5730ceea3e46345b45a.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
fixed several long vs zend_long casts
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index dc5a2120ba..8939e9934a 100644 --- 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)); } /* }}} */ |