diff options
Diffstat (limited to 'ext/recode/recode.c')
| -rw-r--r-- | ext/recode/recode.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ext/recode/recode.c b/ext/recode/recode.c index 5330a6e20a..74a1f1eded 100644 --- a/ext/recode/recode.c +++ b/ext/recode/recode.c @@ -55,11 +55,7 @@ ZEND_BEGIN_MODULE_GLOBALS(recode) RECODE_OUTER outer; ZEND_END_MODULE_GLOBALS(recode) -#ifdef ZTS -# define ReSG(v) TSRMG(recode_globals_id, zend_recode_globals *, v) -#else -# define ReSG(v) (recode_globals.v) -#endif +#define ReSG(v) ZEND_MODULE_GLOBALS_ACCESSOR(recode, v) ZEND_DECLARE_MODULE_GLOBALS(recode) static PHP_GINIT_FUNCTION(recode); @@ -103,11 +99,17 @@ zend_module_entry recode_module_entry = { }; #ifdef COMPILE_DL_RECODE +#ifdef ZTS +ZEND_TSRMLS_CACHE_DEFINE() +#endif ZEND_GET_MODULE(recode) #endif static PHP_GINIT_FUNCTION(recode) { +#if defined(COMPILE_DL_RECODE) && defined(ZTS) + ZEND_TSRMLS_CACHE_UPDATE(); +#endif recode_globals->outer = NULL; } |