diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-19 16:20:02 +0100 |
| commit | c2b90805e81de43b4fa28fa1b30ed255bfba76b2 (patch) | |
| tree | a353bb7b1cb958fd4f3e576ab44f3b6ef03a02c2 /ext/pdo_mysql/php_pdo_mysql_int.h | |
| parent | b44cf1a8540d321583a0d83ebca688ebab10d3b0 (diff) | |
| parent | d0e84c6f4702dc5dda473851dd33c5e6cee82ee6 (diff) | |
| download | php-git-c2b90805e81de43b4fa28fa1b30ed255bfba76b2.tar.gz | |
Merge branch 'master' into openssl_error_store
Diffstat (limited to 'ext/pdo_mysql/php_pdo_mysql_int.h')
| -rw-r--r-- | ext/pdo_mysql/php_pdo_mysql_int.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index a4290fdaf3..20d640c405 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -126,9 +126,9 @@ typedef struct { const MYSQL_FIELD *fields; MYSQL_ROW current_data; #if PDO_USE_MYSQLND - zend_ulong *current_lengths; + const size_t *current_lengths; #else - zend_long *current_lengths; + zend_long *current_lengths; #endif pdo_mysql_error_info einfo; #if PDO_USE_MYSQLND @@ -144,7 +144,7 @@ typedef struct { #endif PDO_MYSQL_PARAM_BIND *bound_result; my_bool *out_null; - zend_ulong *out_length; + zend_ulong *out_length; unsigned int params_given; unsigned max_length:1; } pdo_mysql_stmt; |