diff options
Diffstat (limited to 'ext/json/php_json.h')
| -rw-r--r-- | ext/json/php_json.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ext/json/php_json.h b/ext/json/php_json.h index c47bc0f401..fccab62fb8 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -82,14 +82,10 @@ ZEND_BEGIN_MODULE_GLOBALS(json) ZEND_END_MODULE_GLOBALS(json) ZEND_EXTERN_MODULE_GLOBALS(json); +#define JSON_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(json, v) -#ifdef ZTS -# define JSON_G(v) ZEND_TSRMG(json_globals_id, zend_json_globals *, v) -# ifdef COMPILE_DL_JSON -ZEND_TSRMLS_CACHE_EXTERN; -# endif -#else -# define JSON_G(v) (json_globals.v) +#if defined(ZTS) && defined(COMPILE_DL_JSON) +ZEND_TSRMLS_CACHE_EXTERN(); #endif /* json_decode() options */ |