diff options
| author | Anatol Belski <ab@php.net> | 2016-11-22 00:32:42 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-11-22 00:32:42 +0100 |
| commit | d61db8d6020b2f07d8beb681c9895bb4e5418e46 (patch) | |
| tree | 4cad9f05acb23b0ec177b56f32690aa1c4ee4364 /ext/json/json.c | |
| parent | 2f5e49bdeb145e7f866229d593ceeef80b6669fc (diff) | |
| parent | 5e9b4c26a5e43a4c97555b69b105c265240febd2 (diff) | |
| download | php-git-d61db8d6020b2f07d8beb681c9895bb4e5418e46.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
remove TSRMLS_*
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index 6081519736..219fd58cf5 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -271,12 +271,12 @@ static PHP_FUNCTION(json_decode) } if (depth <= 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Depth must be greater than zero"); + php_error_docref(NULL, E_WARNING, "Depth must be greater than zero"); RETURN_NULL(); } if (depth > INT_MAX) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Depth must be lower than %d", INT_MAX); + php_error_docref(NULL, E_WARNING, "Depth must be lower than %d", INT_MAX); RETURN_NULL(); } |