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 From 49493a2dcfb2cd1758b69b13d9006ead3be0e066 Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Fri, 1 Jan 2016 19:19:27 +0200 Subject: Happy new year (Update copyright to 2016) --- ext/xml/php_xml.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/xml/php_xml.h') diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h index fdce3a4cf0..cecdb8a337 100644 --- a/ext/xml/php_xml.h +++ b/ext/xml/php_xml.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | 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 | -- cgit v1.2.1 From 1ac152938cfe40e98b7b3c8cf403abb113266cfa Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 3 Mar 2016 16:46:04 +0100 Subject: Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE Also re bug #71575. --- ext/xml/php_xml.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/xml/php_xml.h') diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h index 0aa55a5fac..47757c9b8c 100644 --- a/ext/xml/php_xml.h +++ b/ext/xml/php_xml.h @@ -147,7 +147,7 @@ PHP_XML_API zend_string *xml_utf8_encode(const char *, size_t, const XML_Char *) #define XML(v) ZEND_MODULE_GLOBALS_ACCESSOR(xml, v) #if defined(ZTS) && defined(COMPILE_DL_XML) -ZEND_TSRMLS_CACHE_EXTERN(); +ZEND_TSRMLS_CACHE_EXTERN() #endif #endif /* PHP_XML_H */ -- cgit v1.2.1