diff options
| author | Anatol Belski <ab@php.net> | 2016-11-22 00:33:29 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-11-22 00:33:29 +0100 |
| commit | bfb9be9bd4f9629ad501be0720a53c73f7cff285 (patch) | |
| tree | e46d86f4e4d9226bc45158d0df6c95b6d9e25830 /ext/mbstring | |
| parent | 5d95dcdaabbcaa85aab1cf0503241a973c64a487 (diff) | |
| parent | d61db8d6020b2f07d8beb681c9895bb4e5418e46 (diff) | |
| download | php-git-bfb9be9bd4f9629ad501be0720a53c73f7cff285.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
remove TSRMLS_*
Diffstat (limited to 'ext/mbstring')
| -rw-r--r-- | ext/mbstring/mbstring.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 4bcddb9e7a..bbd6d0666b 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -3998,7 +3998,7 @@ detect_end: if (elist != NULL) { efree((void *)elist); } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot handle recursive references"); + php_error_docref(NULL, E_WARNING, "Cannot handle recursive references"); RETURN_FALSE; } efree(stack); @@ -4115,7 +4115,7 @@ conv_end: } } efree(stack); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot handle recursive references"); + php_error_docref(NULL, E_WARNING, "Cannot handle recursive references"); RETURN_FALSE; } efree(stack); |