diff options
| author | Anatol Belski <ab@php.net> | 2014-08-22 08:58:03 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-22 08:58:03 +0200 |
| commit | 79f888a602db3814a6ab03183eff6375bfe9234a (patch) | |
| tree | f1b6d1fb76ca4d613a5cc1b551057dac33d3f585 /ext/pdo_mysql/php_pdo_mysql_int.h | |
| parent | da35db3ec5fc4b27087292c067a6ea1d0f77bf8f (diff) | |
| parent | 411b920a6f8d53025caddb30895b27d04a3576b4 (diff) | |
| download | php-git-79f888a602db3814a6ab03183eff6375bfe9234a.tar.gz | |
Merge remote-tracking branch 'weltling/master'POST_64BIT_BRANCH_MERGE
* weltling/master: (725 commits)
fix zpp
fixed array_pad()
fix zpp
fix zpp
fix zpp
fix zpp and a bit more
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fix zpp
fixed the test
...
Diffstat (limited to 'ext/pdo_mysql/php_pdo_mysql_int.h')
| -rw-r--r-- | ext/pdo_mysql/php_pdo_mysql_int.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index 4455dcbeb6..fe2d216a5f 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -106,7 +106,7 @@ typedef struct { unsigned fetch_table_names:1; unsigned _reserved:31; #if !PDO_USE_MYSQLND - unsigned long max_buffer_size; + php_uint_t max_buffer_size; #endif pdo_mysql_error_info einfo; @@ -122,9 +122,9 @@ typedef struct { const MYSQL_FIELD *fields; MYSQL_ROW current_data; #if PDO_USE_MYSQLND - unsigned long *current_lengths; + php_uint_t *current_lengths; #else - long *current_lengths; + php_int_t *current_lengths; #endif pdo_mysql_error_info einfo; #if PDO_USE_MYSQLND @@ -136,11 +136,11 @@ typedef struct { PDO_MYSQL_PARAM_BIND *params; #ifndef PDO_USE_MYSQLND my_bool *in_null; - unsigned long *in_length; + php_uint_t *in_length; #endif PDO_MYSQL_PARAM_BIND *bound_result; my_bool *out_null; - unsigned long *out_length; + php_uint_t *out_length; unsigned int params_given; unsigned max_length:1; } pdo_mysql_stmt; |