diff options
Diffstat (limited to 'ext/xml')
| -rw-r--r-- | ext/xml/php_xml.h | 12 | ||||
| -rw-r--r-- | ext/xml/xml.c | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h index ed2f709793..809c86a61f 100644 --- a/ext/xml/php_xml.h +++ b/ext/xml/php_xml.h @@ -139,19 +139,9 @@ PHPAPI char *xml_utf8_decode(const XML_Char *, int, int *, const XML_Char *); #define phpext_xml_ptr xml_module_ptr #ifdef ZTS -#define XMLLS_D php_xml_globals *xml_globals -#define XMLLS_DC , PSLS_D -#define XMLLS_C xml_globals -#define XMLLS_CC , XMLLS_C -#define XML(v) (xml_globals->v) -#define XMLLS_FETCH() php_xml_globals *xml_globals = ts_resource(xml_globals_id) +#define XML(v) TSRMG(xml_globals_id, php_xml_globals *, v) #else -#define XMLLS_D -#define XMLLS_DC -#define XMLLS_C -#define XMLLS_CC #define XML(v) (xml_globals.v) -#define XMLLS_FETCH() #endif #endif /* PHP_XML_H */ diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 365ada931a..addebc2f61 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -160,7 +160,7 @@ static int le_xml_parser; #ifdef ZTS -static void php_xml_init_globals(php_xml_globals *xml_globals TSRMLS_DC) +static void php_xml_init_globals(php_xml_globals *xml_globals_p TSRMLS_DC) { XML(default_encoding) = "ISO-8859-1"; } @@ -1045,7 +1045,6 @@ PHP_FUNCTION(xml_parser_create) zval **encodingArg; XML_Char *encoding; char thisfunc[] = "xml_parser_create"; - XMLLS_FETCH(); argc = ZEND_NUM_ARGS(); @@ -1097,7 +1096,6 @@ PHP_FUNCTION(xml_parser_create_ns) zval **encodingArg, **sepArg; XML_Char *encoding, *sep; char thisfunc[] = "xml_parser_create"; - XMLLS_FETCH(); argc = ZEND_NUM_ARGS(); |