diff options
| author | Andrey Hristov <andrey@php.net> | 2015-11-12 14:04:37 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-11-12 16:19:16 +0100 |
| commit | 0a7e08d385f5d478cdc51c4d4c52dd371a8f9c5b (patch) | |
| tree | 10b11d845946bf98f9b17e41abbbd13114cde3b6 /ext/mysqli/mysqli_prop.c | |
| parent | abc8c000727845adf7ad0505044d85bbb49294df (diff) | |
| download | php-git-0a7e08d385f5d478cdc51c4d4c52dd371a8f9c5b.tar.gz | |
MNDR:
- cleanup in mysqlnd_result.c
- switch from zend_ulong to size_t for lengths. Accordingly change
mysqli and pdo_mysql for this.
Diffstat (limited to 'ext/mysqli/mysqli_prop.c')
| -rw-r--r-- | ext/mysqli/mysqli_prop.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c index 11f136e603..168edb9364 100644 --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@ -15,8 +15,6 @@ | Author: Georg Richter <georg@php.net> | | Andrey Hristov <andrey@php.net> | +----------------------------------------------------------------------+ - - $Id$ */ #ifdef HAVE_CONFIG_H @@ -289,7 +287,11 @@ static zval *result_type_read(mysqli_object *obj, zval *retval) static zval *result_lengths_read(mysqli_object *obj, zval *retval) { MYSQL_RES *p; - zend_ulong *ret; +#if defined(MYSQLI_USE_MYSQLND) + const size_t *ret; +#else + const zend_ulong *ret; +#endif uint field_count; CHECK_STATUS(MYSQLI_STATUS_VALID); |