diff options
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 023a87e9fb..ea90ee49e0 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -116,6 +116,9 @@ static int le_result, le_link, le_plink; (mysql_field_count(mysql)>0) #endif +ZEND_DECLARE_MODULE_GLOBALS(mysql) +static PHP_GINIT_FUNCTION(mysql); + typedef struct _php_mysql_conn { MYSQL conn; int active_result_id; @@ -219,12 +222,14 @@ zend_module_entry mysql_module_entry = { PHP_RSHUTDOWN(mysql), PHP_MINFO(mysql), "1.0", - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(mysql), + PHP_GINIT(mysql), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ -ZEND_DECLARE_MODULE_GLOBALS(mysql) - #ifdef COMPILE_DL_MYSQL ZEND_GET_MODULE(mysql) #endif @@ -353,9 +358,9 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -/* {{{ php_mysql_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void php_mysql_init_globals(zend_mysql_globals *mysql_globals) +static PHP_GINIT_FUNCTION(mysql) { mysql_globals->num_persistent = 0; mysql_globals->default_socket = NULL; @@ -374,8 +379,6 @@ static void php_mysql_init_globals(zend_mysql_globals *mysql_globals) */ ZEND_MODULE_STARTUP_D(mysql) { - ZEND_INIT_MODULE_GLOBALS(mysql, php_mysql_init_globals, NULL); - REGISTER_INI_ENTRIES(); le_result = zend_register_list_destructors_ex(_free_mysql_result, NULL, "mysql result", module_number); le_link = zend_register_list_destructors_ex(_close_mysql_link, NULL, "mysql link", module_number); |