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/spl/php_spl.c | |
| parent | c3ed91477a011e494559d6f65301ef6b2e38cd22 (diff) | |
| download | php-git-1dbaae2795b756a3875c53da00b277f241cc04b8.tar.gz | |
Added automatic module globals management
Diffstat (limited to 'ext/spl/php_spl.c')
| -rwxr-xr-x | ext/spl/php_spl.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index fce87de40c..07dff83fd9 100755 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -50,9 +50,9 @@ zend_function_entry spl_functions_none[] = { }; /* }}} */ -/* {{{ spl_init_globals +/* {{{ PHP_GINIT_FUNCTION */ -static void spl_init_globals(zend_spl_globals *spl_globals) +static PHP_GINIT_FUNCTION(spl) { spl_globals->autoload_extensions = NULL; spl_globals->autoload_functions = NULL; @@ -645,8 +645,6 @@ zend_function_entry spl_functions[] = { */ PHP_MINIT_FUNCTION(spl) { - ZEND_INIT_MODULE_GLOBALS(spl, spl_init_globals, NULL); - PHP_MINIT(spl_iterators)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(spl_array)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(spl_directory)(INIT_FUNC_ARGS_PASSTHRU); @@ -704,7 +702,11 @@ zend_module_entry spl_module_entry = { PHP_RSHUTDOWN(spl), PHP_MINFO(spl), "0.2", - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(spl), + PHP_GINIT(spl), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ |