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/json.c | |
| parent | a9a26100b4d77a0a556dd50e44b265bfdec5bdde (diff) | |
| parent | 1ac152938cfe40e98b7b3c8cf403abb113266cfa (diff) | |
| download | php-git-f57c0b324912ae3fce7940b836e35ca368cbd0ad.tar.gz | |
Merge branch 'PHP-7.0'
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index 971fe15f05..bd7c0b0c1b 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -176,7 +176,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 |