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/libxml/php_libxml.h | |
| parent | 0615aa82d74f91efa4a5a7bcee1b9718fa03f15c (diff) | |
| download | php-git-4e66cce87ce0e57a7394486412e61abcfc5f3520.tar.gz | |
switch to the unified globals accessor where appropriate
Diffstat (limited to 'ext/libxml/php_libxml.h')
| -rw-r--r-- | ext/libxml/php_libxml.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h index 5a68a57494..6dc9daaeaf 100644 --- a/ext/libxml/php_libxml.h +++ b/ext/libxml/php_libxml.h @@ -115,14 +115,11 @@ PHP_LIBXML_API zend_bool php_libxml_disable_entity_loader(zend_bool disable); PHP_LIBXML_API void php_libxml_initialize(void); PHP_LIBXML_API void php_libxml_shutdown(void); -#ifdef ZTS -#define LIBXML(v) ZEND_TSRMG(libxml_globals_id, zend_libxml_globals *, v) -#ifdef COMPILE_DL_LIBXML +#define LIBXML(v) ZEND_MODULE_GLOBALS_ACCESSOR(libxml, v) + +#if defined(ZTS) && defined(COMPILE_DL_LIBXML) ZEND_TSRMLS_CACHE_EXTERN(); #endif -#else -#define LIBXML(v) (libxml_globals.v) -#endif #else /* HAVE_LIBXML */ #define libxml_module_ptr NULL |