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/intl/php_intl.h | |
| parent | 0615aa82d74f91efa4a5a7bcee1b9718fa03f15c (diff) | |
| download | php-git-4e66cce87ce0e57a7394486412e61abcfc5f3520.tar.gz | |
switch to the unified globals accessor where appropriate
Diffstat (limited to 'ext/intl/php_intl.h')
| -rw-r--r-- | ext/intl/php_intl.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ext/intl/php_intl.h b/ext/intl/php_intl.h index 638fdef1ca..b8d1600edb 100644 --- a/ext/intl/php_intl.h +++ b/ext/intl/php_intl.h @@ -55,17 +55,13 @@ ZEND_BEGIN_MODULE_GLOBALS(intl) zend_bool use_exceptions; ZEND_END_MODULE_GLOBALS(intl) -/* Macro to access request-wide global variables. */ -#ifdef ZTS -#define INTL_G(v) ZEND_TSRMG(intl_globals_id, zend_intl_globals *, v) -#ifdef COMPILE_DL_INTL +#if defined(ZTS) && defined(COMPILE_DL_INTL) ZEND_TSRMLS_CACHE_EXTERN(); #endif -#else -#define INTL_G(v) (intl_globals.v) -#endif ZEND_EXTERN_MODULE_GLOBALS(intl) +/* Macro to access request-wide global variables. */ +#define INTL_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(intl, v) PHP_MINIT_FUNCTION(intl); PHP_MSHUTDOWN_FUNCTION(intl); |