From 4e66cce87ce0e57a7394486412e61abcfc5f3520 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 29 Jul 2015 12:26:23 +0200 Subject: switch to the unified globals accessor where appropriate --- ext/xml/php_xml.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'ext/xml/php_xml.h') diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h index c8eb3cf6d1..8f92eefe1d 100644 --- a/ext/xml/php_xml.h +++ b/ext/xml/php_xml.h @@ -144,14 +144,11 @@ PHP_XML_API zend_string *xml_utf8_encode(const char *, size_t, const XML_Char *) #define phpext_xml_ptr xml_module_ptr -#ifdef ZTS -#define XML(v) ZEND_TSRMG(xml_globals_id, zend_xml_globals *, v) -#ifdef COMPILE_DL_XML +#define XML(v) ZEND_MODULE_GLOBALS_ACCESSOR(xml, v) + +#if defined(ZTS) && defined(COMPILE_DL_XML) ZEND_TSRMLS_CACHE_EXTERN(); #endif -#else -#define XML(v) (xml_globals.v) -#endif #endif /* PHP_XML_H */ -- cgit v1.2.1