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/filter/php_filter.h | |
| parent | 0615aa82d74f91efa4a5a7bcee1b9718fa03f15c (diff) | |
| download | php-git-4e66cce87ce0e57a7394486412e61abcfc5f3520.tar.gz | |
switch to the unified globals accessor where appropriate
Diffstat (limited to 'ext/filter/php_filter.h')
| -rw-r--r-- | ext/filter/php_filter.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/filter/php_filter.h b/ext/filter/php_filter.h index 223e7e0015..2085b98e45 100644 --- a/ext/filter/php_filter.h +++ b/ext/filter/php_filter.h @@ -65,13 +65,11 @@ ZEND_BEGIN_MODULE_GLOBALS(filter) zend_long default_filter_flags; ZEND_END_MODULE_GLOBALS(filter) -#ifdef ZTS -#define IF_G(v) ZEND_TSRMG(filter_globals_id, zend_filter_globals *, v) +#if defined(COMPILE_DL_FILTER) && defined(ZTS) ZEND_TSRMLS_CACHE_EXTERN(); -#else -#define IF_G(v) (filter_globals.v) #endif +#define IF_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(filter, v) #define PHP_INPUT_FILTER_PARAM_DECL zval *value, zend_long flags, zval *option_array, char *charset void php_filter_int(PHP_INPUT_FILTER_PARAM_DECL); |