diff options
| author | Anatol Belski <ab@php.net> | 2014-10-17 14:16:40 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-17 14:16:40 +0200 |
| commit | fea10f6a5e5ff4d22adea5fd04476a88d4f76db8 (patch) | |
| tree | aeb75efdddd8ae643662c88bef39faafacc8130a /ext/json/php_json.h | |
| parent | 83b8e281dba11f4a037dd5977812f84661fe895e (diff) | |
| download | php-git-fea10f6a5e5ff4d22adea5fd04476a88d4f76db8.tar.gz | |
ext/iconv, ext/json and ext/session use static tsrmls pointer
Diffstat (limited to 'ext/json/php_json.h')
| -rw-r--r-- | ext/json/php_json.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/json/php_json.h b/ext/json/php_json.h index 5b2dc127dd..64ad811bc7 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -44,7 +44,10 @@ ZEND_BEGIN_MODULE_GLOBALS(json) ZEND_END_MODULE_GLOBALS(json) #ifdef ZTS -# define JSON_G(v) TSRMG(json_globals_id, zend_json_globals *, v) +# 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) #endif |