diff options
| author | Nikita Popov <nikic@php.net> | 2016-03-03 16:46:04 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-03-03 16:50:01 +0100 |
| commit | 1ac152938cfe40e98b7b3c8cf403abb113266cfa (patch) | |
| tree | dd2f32f9075d3ca31946c5b9d10a464a07776c3a /ext/json | |
| parent | c4b188871e7abb7c6cc20d05ceda4cea082efcd2 (diff) | |
| download | php-git-1ac152938cfe40e98b7b3c8cf403abb113266cfa.tar.gz | |
Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
Also re bug #71575.
Diffstat (limited to 'ext/json')
| -rw-r--r-- | ext/json/json.c | 2 | ||||
| -rw-r--r-- | ext/json/php_json.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index 20bbcdc59e..81258cb734 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -175,7 +175,7 @@ zend_module_entry json_module_entry = { #ifdef COMPILE_DL_JSON #ifdef ZTS -ZEND_TSRMLS_CACHE_DEFINE(); +ZEND_TSRMLS_CACHE_DEFINE() #endif ZEND_GET_MODULE(json) #endif diff --git a/ext/json/php_json.h b/ext/json/php_json.h index f0a9b5c730..7bcca27335 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -89,7 +89,7 @@ PHP_JSON_API ZEND_EXTERN_MODULE_GLOBALS(json) #define JSON_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(json, v) #if defined(ZTS) && defined(COMPILE_DL_JSON) -ZEND_TSRMLS_CACHE_EXTERN(); +ZEND_TSRMLS_CACHE_EXTERN() #endif PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options); |
