diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-06-15 18:33:09 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-06-15 18:33:09 +0000 |
| commit | 1dbaae2795b756a3875c53da00b277f241cc04b8 (patch) | |
| tree | fd516b57354eb9480e89dcd0503fa990d3cc2068 /ext/mssql | |
| parent | c3ed91477a011e494559d6f65301ef6b2e38cd22 (diff) | |
| download | php-git-1dbaae2795b756a3875c53da00b277f241cc04b8.tar.gz | |
Added automatic module globals management
Diffstat (limited to 'ext/mssql')
| -rw-r--r-- | ext/mssql/php_mssql.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index cce69ad92f..6b186d7822 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -81,6 +81,9 @@ zend_function_entry mssql_functions[] = { {NULL, NULL, NULL} }; +ZEND_DECLARE_MODULE_GLOBALS(mssql) +static PHP_GINIT_FUNCTION(mssql); + zend_module_entry mssql_module_entry = { STANDARD_MODULE_HEADER, @@ -91,12 +94,14 @@ zend_module_entry mssql_module_entry = PHP_RINIT(mssql), PHP_RSHUTDOWN(mssql), PHP_MINFO(mssql), - NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + NO_VERSION_YET, + PHP_MODULE_GLOBALS(mssql), + PHP_GINIT(mssql), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; -ZEND_DECLARE_MODULE_GLOBALS(mssql) - #ifdef COMPILE_DL_MSSQL ZEND_GET_MODULE(mssql) # ifdef PHP_WIN32 @@ -273,7 +278,7 @@ static void _mssql_bind_hash_dtor(void *data) zval_ptr_dtor(&(bind->zval)); } -static void php_mssql_init_globals(zend_mssql_globals *mssql_globals) +static PHP_GINIT_FUNCTION(mssql) { long compatability_mode; @@ -288,8 +293,6 @@ static void php_mssql_init_globals(zend_mssql_globals *mssql_globals) PHP_MINIT_FUNCTION(mssql) { - ZEND_INIT_MODULE_GLOBALS(mssql, php_mssql_init_globals, NULL); - REGISTER_INI_ENTRIES(); le_statement = zend_register_list_destructors_ex(_free_mssql_statement, NULL, "mssql statement", module_number); |