diff options
Diffstat (limited to 'ext/simplexml')
| -rw-r--r-- | ext/simplexml/php_simplexml.h | 2 | ||||
| -rw-r--r-- | ext/simplexml/simplexml.c | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/ext/simplexml/php_simplexml.h b/ext/simplexml/php_simplexml.h index 233452dafa..ec5ac2671c 100644 --- a/ext/simplexml/php_simplexml.h +++ b/ext/simplexml/php_simplexml.h @@ -26,10 +26,8 @@ extern zend_module_entry simplexml_module_entry; #ifdef PHP_WIN32 #define PHP_SIMPLEXML_API __declspec(dllexport) -#define SIMPLEXML_IMPORT __declspec(dllimport) #else #define PHP_SIMPLEXML_API -#define SIMPLEXML_IMPORT extern #endif #ifdef ZTS diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 367010454b..3cee43d969 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -28,7 +28,6 @@ #include "php_simplexml.h" zend_class_entry *sxe_class_entry; -SIMPLEXML_IMPORT int xml_parser_inited; #define SKIP_TEXT(__p) \ if ((__p)->type == XML_TEXT_NODE) { \ @@ -999,10 +998,7 @@ PHP_MINIT_FUNCTION(simplexml) sxe.create_object = sxe_object_new; sxe_class_entry = zend_register_internal_class(&sxe TSRMLS_CC); - if (!xml_parser_inited) { - xmlInitThreads(); - xml_parser_inited = 1; - } + xmlInitParser(); return SUCCESS; } @@ -1012,10 +1008,7 @@ PHP_MINIT_FUNCTION(simplexml) */ PHP_MSHUTDOWN_FUNCTION(simplexml) { - if (xml_parser_inited) { - xmlCleanupParser(); - xml_parser_inited = 0; - } + xmlCleanupParser(); return SUCCESS; } |