diff options
| author | Sara Golemon <pollita@php.net> | 2018-01-23 09:24:40 -0500 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2018-01-23 09:24:40 -0500 |
| commit | e954bafc285e97cbdb9718b4cf2de77feaed3771 (patch) | |
| tree | 7ed08955204be594d288e5ff888e7e065eb03ec7 | |
| parent | d46d53a7bcc99bb8d993852ef84e7a83d703f3db (diff) | |
| parent | e88e83d3e5c33fcd76f08b23e1a2e4e8dc98ce41 (diff) | |
| download | php-git-e954bafc285e97cbdb9718b4cf2de77feaed3771.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
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 c445aa617c..79267ac00d 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -720,7 +720,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(int severity, in 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; \ |