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/iconv | |
| parent | 0615aa82d74f91efa4a5a7bcee1b9718fa03f15c (diff) | |
| download | php-git-4e66cce87ce0e57a7394486412e61abcfc5f3520.tar.gz | |
switch to the unified globals accessor where appropriate
Diffstat (limited to 'ext/iconv')
| -rw-r--r-- | ext/iconv/php_iconv.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h index 1dc25de9dd..738a4881e9 100644 --- a/ext/iconv/php_iconv.h +++ b/ext/iconv/php_iconv.h @@ -75,13 +75,10 @@ ZEND_BEGIN_MODULE_GLOBALS(iconv) char *output_encoding; ZEND_END_MODULE_GLOBALS(iconv) -#ifdef ZTS -# define ICONVG(v) ZEND_TSRMG(iconv_globals_id, zend_iconv_globals *, v) -# ifdef COMPILE_DL_ICONV +#define ICONVG(v) ZEND_MODULE_GLOBALS_ACCESSOR(iconv, v) + +#ifdef defined(ZTS) && defined(COMPILE_DL_ICONV) ZEND_TSRMLS_CACHE_EXTERN(); -# endif -#else -# define ICONVG(v) (iconv_globals.v) #endif #ifdef HAVE_IBM_ICONV |