diff options
| author | Andrea Faulds <ajf@ajf.me> | 2016-09-11 22:44:46 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2016-09-11 22:44:46 +0100 |
| commit | d690014bf35507ccb7a1150a27504d2f87848842 (patch) | |
| tree | 5913a3bbcad247de83e68e0e61448279ff5f5f47 /ext/standard/basic_functions.c | |
| parent | 529811cfb0c664c53752a295adcda472d336205a (diff) | |
| download | php-git-d690014bf35507ccb7a1150a27504d2f87848842.tar.gz | |
Remove zpp fallback code (always use Fast ZPP)
Squashed commit of the following:
commit 3e27fbb3d22b42d181e15c345f1c59a007b6b58c
Author: Andrea Faulds <ajf@ajf.me>
Date: Sun Sep 11 19:14:37 2016 +0100
Keep dummy FAST_ZPP macro for compatibility
commit 8a7cfd00deaa4a3c5026c97580c49c886c72a5b4
Author: Andrea Faulds <ajf@ajf.me>
Date: Mon Sep 5 22:36:03 2016 +0100
Remove FAST_ZPP macro and plain zpp fallback code
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 99a8837869..09124fa025 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4770,16 +4770,10 @@ PHP_FUNCTION(call_user_func) zend_fcall_info fci; zend_fcall_info_cache fci_cache; -#ifndef FAST_ZPP - if (zend_parse_parameters(ZEND_NUM_ARGS(), "f*", &fci, &fci_cache, &fci.params, &fci.param_count) == FAILURE) { - return; - } -#else ZEND_PARSE_PARAMETERS_START(1, -1) Z_PARAM_FUNC(fci, fci_cache) Z_PARAM_VARIADIC('*', fci.params, fci.param_count) ZEND_PARSE_PARAMETERS_END(); -#endif fci.retval = &retval; @@ -4798,16 +4792,10 @@ PHP_FUNCTION(call_user_func_array) zend_fcall_info fci; zend_fcall_info_cache fci_cache; -#ifndef FAST_ZPP - if (zend_parse_parameters(ZEND_NUM_ARGS(), "fa/", &fci, &fci_cache, ¶ms) == FAILURE) { - return; - } -#else ZEND_PARSE_PARAMETERS_START(2, 2) Z_PARAM_FUNC(fci, fci_cache) Z_PARAM_ARRAY_EX(params, 0, 1) ZEND_PARSE_PARAMETERS_END(); -#endif zend_fcall_info_args(&fci, params); fci.retval = &retval; |