diff options
Diffstat (limited to 'ext/tidy/tidy.c')
| -rw-r--r-- | ext/tidy/tidy.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 31d09b4a82..40f4ff567b 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -331,7 +331,11 @@ zend_module_entry tidy_module_entry = { NULL, PHP_MINFO(tidy), PHP_TIDY_MODULE_VERSION, - STANDARD_MODULE_PROPERTIES + PHP_MODULE_GLOBALS(tidy), + NULL, + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX }; #ifdef COMPILE_DL_TIDY @@ -957,20 +961,8 @@ static int php_tidy_parse_string(PHPTidyObj *obj, char *string, int len, char *e return SUCCESS; } -static void tidy_globals_ctor(void *global TSRMLS_DC) -{ - -} - -static void tidy_globals_dtor(void *global TSRMLS_DC) -{ - -} - PHP_MINIT_FUNCTION(tidy) { - ZEND_INIT_MODULE_GLOBALS(tidy, tidy_globals_ctor, tidy_globals_dtor); - REGISTER_INI_ENTRIES(); REGISTER_TIDY_CLASS(tidy, doc, NULL, 0); REGISTER_TIDY_CLASS(tidyNode, node, NULL, ZEND_ACC_FINAL_CLASS); @@ -1002,11 +994,6 @@ PHP_RINIT_FUNCTION(tidy) PHP_MSHUTDOWN_FUNCTION(tidy) { -#ifdef ZTS - ts_free_id(tidy_globals_id); -#else - tidy_globals_dtor(&tidy_globals TSRMLS_CC); -#endif UNREGISTER_INI_ENTRIES(); return SUCCESS; } |