diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/pdo_mysql/php_pdo_mysql_int.h | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/pdo_mysql/php_pdo_mysql_int.h')
| -rw-r--r-- | ext/pdo_mysql/php_pdo_mysql_int.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index 03f42509a2..d8fe8987f4 100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -107,7 +107,7 @@ typedef struct { unsigned buffered:1; unsigned emulate_prepare:1; unsigned fetch_table_names:1; - unsigned _reserved:31; + unsigned _reserved:31; #if !PDO_USE_MYSQLND zend_ulong max_buffer_size; #endif @@ -134,7 +134,7 @@ typedef struct { MYSQLND_STMT *stmt; #else MYSQL_STMT *stmt; -#endif +#endif int num_params; PDO_MYSQL_PARAM_BIND *params; #ifndef PDO_USE_MYSQLND |