summaryrefslogtreecommitdiff
path: root/ext/xml/php_xml.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-12-18 10:09:02 +0100
committerAnatol Belski <ab@php.net>2014-12-18 10:09:02 +0100
commit4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch)
treec9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/xml/php_xml.h
parent79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff)
parentdec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff)
downloadphp-git-POST_NATIVE_TLS_MERGE.tar.gz
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/xml/php_xml.h')
-rw-r--r--ext/xml/php_xml.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h
index cdb08f812e..d7f0d6d046 100644
--- a/ext/xml/php_xml.h
+++ b/ext/xml/php_xml.h
@@ -142,7 +142,10 @@ PHPAPI zend_string *xml_utf8_encode(const char *, size_t, const XML_Char *);
#define phpext_xml_ptr xml_module_ptr
#ifdef ZTS
-#define XML(v) TSRMG(xml_globals_id, zend_xml_globals *, v)
+#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)
#endif