cvs: php4 /ext/dom php_dom.c xml_common.h

rrichards Sat Jun 14 14:14:59 2003 EDT Modified files: /php4/ext/dom php_dom.c xml_common.h Log: use xmlInitParser instead of xmlInitThreads reentrant safe as well no need for xml_parser_inited Index: php4/ext/dom/php_dom.c diff -u php4/ext/dom/php_dom.c:1.11 php4/ext/dom/php_dom.c:1.12 --- php4/ext/dom/php_dom.c:1.11 Sat Jun 14 11:27:15 2003 +++ php4/ext/dom/php_dom.c Sat Jun 14 14:14:59 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dom.c,v 1.11 2003/06/14 15:27:15 rrichards Exp $ */ +/* $Id: php_dom.c,v 1.12 2003/06/14 18:14:59 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -37,8 +37,6 @@ #define PHP_XPATH 1 #define PHP_XPTR 2 -DOM_IMPORT int xml_parser_inited; - zend_object_handlers dom_object_handlers; static HashTable classes; @@ -580,10 +578,7 @@ REGISTER_LONG_CONSTANT("XML_ATTRIBUTE_ENUMERATION", XML_ATTRIBUTE_ENUMERATION, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("XML_ATTRIBUTE_NOTATION", XML_ATTRIBUTE_NOTATION, CONST_CS | CONST_PERSISTENT); - if (!xml_parser_inited) { - xmlInitThreads(); - xml_parser_inited = 1; - } + xmlInitParser(); return SUCCESS; } @@ -611,10 +606,7 @@ PHP_MSHUTDOWN_FUNCTION(dom) { - if (xml_parser_inited) { - xmlCleanupParser(); - xml_parser_inited = 0; - } + xmlCleanupParser(); zend_hash_destroy(&dom_domstringlist_prop_handlers); zend_hash_destroy(&dom_namelist_prop_handlers); Index: php4/ext/dom/xml_common.h diff -u php4/ext/dom/xml_common.h:1.6 php4/ext/dom/xml_common.h:1.7 --- php4/ext/dom/xml_common.h:1.6 Sat Jun 14 11:27:15 2003 +++ php4/ext/dom/xml_common.h Sat Jun 14 14:14:59 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml_common.h,v 1.6 2003/06/14 15:27:15 rrichards Exp $ */ +/* $Id: xml_common.h,v 1.7 2003/06/14 18:14:59 rrichards Exp $ */ #ifndef PHP_XML_COMMON_H #define PHP_XML_COMMON_H @@ -61,9 +61,6 @@ #else #define PHPAPI __declspec(dllimport) #endif /* DOM_EXPORTS */ -#define DOM_IMPORT __declspec(dllimport) -#else -#define DOM_IMPORT extern #endif /* PHP_WIN32 */ #ifdef ZTS