diff options
| author | Anatol Belski <ab@php.net> | 2015-07-29 12:26:23 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-07-29 13:26:35 +0200 |
| commit | 4e66cce87ce0e57a7394486412e61abcfc5f3520 (patch) | |
| tree | 74da7597406fcb73d654f193d139c063b3c7093e /ext/xml | |
| parent | 0615aa82d74f91efa4a5a7bcee1b9718fa03f15c (diff) | |
| download | php-git-4e66cce87ce0e57a7394486412e61abcfc5f3520.tar.gz | |
switch to the unified globals accessor where appropriate
Diffstat (limited to 'ext/xml')
| -rw-r--r-- | ext/xml/php_xml.h | 9 |
1 files changed, 3 insertions, 6 deletions
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 */ |