diff options
| author | Aaron Piotrowski <aaron@trowski.com> | 2016-06-10 22:02:23 -0500 |
|---|---|---|
| committer | Aaron Piotrowski <aaron@trowski.com> | 2016-06-10 22:02:23 -0500 |
| commit | e3c681aa5cc71122a8d2fae42e6513fc413ccac8 (patch) | |
| tree | 5f1df62f7b666028edb0ee1adf083a52d63df45a /ext/xml/php_xml.h | |
| parent | fb4e3085cbaa76eb8f28eebf848a81d1c0190067 (diff) | |
| parent | 792e89385ca6fc722a03590722eb7745a2374720 (diff) | |
| download | php-git-e3c681aa5cc71122a8d2fae42e6513fc413ccac8.tar.gz | |
Merge branch 'master' into throw-error-in-extensions
Diffstat (limited to 'ext/xml/php_xml.h')
| -rw-r--r-- | ext/xml/php_xml.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h index c8eb3cf6d1..47757c9b8c 100644 --- a/ext/xml/php_xml.h +++ b/ext/xml/php_xml.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -144,13 +144,10 @@ 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 -ZEND_TSRMLS_CACHE_EXTERN(); -#endif -#else -#define XML(v) (xml_globals.v) +#define XML(v) ZEND_MODULE_GLOBALS_ACCESSOR(xml, v) + +#if defined(ZTS) && defined(COMPILE_DL_XML) +ZEND_TSRMLS_CACHE_EXTERN() #endif #endif /* PHP_XML_H */ |