diff options
| author | Nikita Popov <nikic@php.net> | 2016-03-03 16:50:47 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-03-03 16:50:47 +0100 |
| commit | f57c0b324912ae3fce7940b836e35ca368cbd0ad (patch) | |
| tree | f744fb9c7b2966fa5feb795ce3531ea0a873ddde /ext/json/php_json.h | |
| parent | a9a26100b4d77a0a556dd50e44b265bfdec5bdde (diff) | |
| parent | 1ac152938cfe40e98b7b3c8cf403abb113266cfa (diff) | |
| download | php-git-f57c0b324912ae3fce7940b836e35ca368cbd0ad.tar.gz | |
Merge branch 'PHP-7.0'
Diffstat (limited to 'ext/json/php_json.h')
| -rw-r--r-- | ext/json/php_json.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/json/php_json.h b/ext/json/php_json.h index d8bf0dfe9d..d1fabd1e6b 100644 --- a/ext/json/php_json.h +++ b/ext/json/php_json.h @@ -86,11 +86,11 @@ ZEND_BEGIN_MODULE_GLOBALS(json) php_json_error_code error_code; ZEND_END_MODULE_GLOBALS(json) -PHP_JSON_API ZEND_EXTERN_MODULE_GLOBALS(json); +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); |