diff options
Diffstat (limited to 'ext/iconv/iconv.c')
| -rw-r--r-- | ext/iconv/iconv.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 6b7c483759..2bd527cf79 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -80,6 +80,9 @@ zend_function_entry iconv_functions[] = { }; /* }}} */ +ZEND_DECLARE_MODULE_GLOBALS(iconv) +static PHP_GINIT_FUNCTION(iconv); + /* {{{ iconv_module_entry */ zend_module_entry iconv_module_entry = { @@ -92,16 +95,27 @@ zend_module_entry iconv_module_entry = { NULL, PHP_MINFO(miconv), NO_VERSION_YET, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(iconv), + PHP_GINIT(iconv), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; /* }}} */ -ZEND_DECLARE_MODULE_GLOBALS(iconv) - #ifdef COMPILE_DL_ICONV ZEND_GET_MODULE(iconv) #endif +/* {{{ PHP_GINIT_FUNCTION */ +static PHP_GINIT_FUNCTION(iconv) +{ + iconv_globals->input_encoding = NULL; + iconv_globals->output_encoding = NULL; + iconv_globals->internal_encoding = NULL; +} +/* }}} */ + #ifdef HAVE_LIBICONV #define iconv libiconv #endif @@ -151,21 +165,11 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -/* {{{ php_iconv_init_globals */ -static void php_iconv_init_globals(zend_iconv_globals *iconv_globals) -{ - iconv_globals->input_encoding = NULL; - iconv_globals->output_encoding = NULL; - iconv_globals->internal_encoding = NULL; -} -/* }}} */ - /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(miconv) { char *version = "unknown"; - ZEND_INIT_MODULE_GLOBALS(iconv, php_iconv_init_globals, NULL); REGISTER_INI_ENTRIES(); #if HAVE_LIBICONV |