diff options
| author | Sara Golemon <pollita@php.net> | 2018-01-23 09:24:47 -0500 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2018-01-23 09:24:47 -0500 |
| commit | 0067420049e204f06f6375922ee56dd4b6de7294 (patch) | |
| tree | 152b5a054f65b4768eb3242a33531a7efaf71bf8 | |
| parent | 871066523e8c6dc33cb4448d675cfa50cc183e43 (diff) | |
| parent | e954bafc285e97cbdb9718b4cf2de77feaed3771 (diff) | |
| download | php-git-0067420049e204f06f6375922ee56dd4b6de7294.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Use Z_EXPECTED_LONG to initialize FAST_ZPP parsing loop
| -rw-r--r-- | Zend/zend_API.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h index e8f293053a..3840770362 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -733,7 +733,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(zend_bool throw_ int _num_args = EX_NUM_ARGS(); \ int _i; \ zval *_real_arg, *_arg = NULL; \ - zend_expected_type _expected_type = IS_UNDEF; \ + zend_expected_type _expected_type = Z_EXPECTED_LONG; \ char *_error = NULL; \ zend_bool _dummy; \ zend_bool _optional = 0; \ |