diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
| commit | db72160e5ac2b267b9ffa23ad84e62e609382a44 (patch) | |
| tree | 6e50c2826f98308d500cc826934a503751d4d566 /ext/mysql/php_mysql_structs.h | |
| parent | be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 (diff) | |
| parent | f469dc7429f2257aac6f46228302408608fbd62f (diff) | |
| download | php-git-db72160e5ac2b267b9ffa23ad84e62e609382a44.tar.gz | |
Merge branch 'master' into integer_semantics
Conflicts:
Zend/zend_operators.h
Diffstat (limited to 'ext/mysql/php_mysql_structs.h')
| -rw-r--r-- | ext/mysql/php_mysql_structs.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/mysql/php_mysql_structs.h b/ext/mysql/php_mysql_structs.h index 0e8ab482a1..c39e5b25af 100644 --- a/ext/mysql/php_mysql_structs.h +++ b/ext/mysql/php_mysql_structs.h @@ -112,18 +112,18 @@ PHP_FUNCTION(mysql_set_charset); ZEND_BEGIN_MODULE_GLOBALS(mysql) zend_resource *default_link; - long num_links,num_persistent; - long max_links,max_persistent; - long allow_persistent; - long default_port; + zend_long num_links,num_persistent; + zend_long max_links,max_persistent; + zend_long allow_persistent; + zend_long default_port; char *default_host, *default_user, *default_password; char *default_socket; char *connect_error; - long connect_errno; - long connect_timeout; - long result_allocated; - long trace_mode; - long allow_local_infile; + zend_long connect_errno; + zend_long connect_timeout; + zend_long result_allocated; + zend_long trace_mode; + zend_long allow_local_infile; ZEND_END_MODULE_GLOBALS(mysql) #ifdef ZTS |