diff options
| author | Anatol Belski <ab@php.net> | 2014-10-03 20:30:49 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-03 20:30:49 +0200 |
| commit | ee4ae7fbc3ba6de5f51f95a621e14a18dd55c95d (patch) | |
| tree | d774f5b506e70bc8a70ef22988e2d374bf0756b8 /Zend/zend.h | |
| parent | 45e23645a42ba939fb1cca9cc099f977af2a4722 (diff) | |
| parent | 1ff094deb481234c0aa2fb5b0ee144b7aba924ff (diff) | |
| download | php-git-ee4ae7fbc3ba6de5f51f95a621e14a18dd55c95d.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
remove the remains of dsp files handling
fix EX usage
remove misprint parentheses
remove misprint parentheses
Replaced EG(This) and EX(object) with EX(This). Internal functions now recieves zend_execute_data as the first argument.
And this one...
It should be in extern c
Remove useless condition
NEWS entry for previous commit
NEWS entry for previous commit
add IPv6 support to php-fpm
Micro optimization for the most frequency case
Add hash to EXTENSIONS file
Remove extensions which are long gone
we also have xz release tarballs since 5.5
Fix ZTS build
improved file size computation in stat()
Fixed incorrect compilation
5.5.19 now
Diffstat (limited to 'Zend/zend.h')
| -rw-r--r-- | Zend/zend.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index 2c1ebc8ca1..81c165210f 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -52,14 +52,13 @@ # define HANDLE_UNBLOCK_INTERRUPTIONS() ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS() #endif -#define INTERNAL_FUNCTION_PARAMETERS uint32_t param_count, zval *return_value TSRMLS_DC -#define INTERNAL_FUNCTION_PARAM_PASSTHRU param_count, return_value TSRMLS_CC +#define INTERNAL_FUNCTION_PARAMETERS zend_execute_data *execute_data, zval *return_value TSRMLS_DC +#define INTERNAL_FUNCTION_PARAM_PASSTHRU execute_data, return_value TSRMLS_CC #define USED_RET() \ - (!EG(current_execute_data) || \ - !EG(current_execute_data)->prev_execute_data || \ - !ZEND_USER_CODE(EG(current_execute_data)->prev_execute_data->func->common.type) || \ - !(EG(current_execute_data)->prev_execute_data->opline->result_type & EXT_TYPE_UNUSED)) + (!EX(prev_execute_data) || \ + !ZEND_USER_CODE(EX(prev_execute_data)->func->common.type) || \ + !(EX(prev_execute_data)->opline->result_type & EXT_TYPE_UNUSED)) #ifdef ZEND_ENABLE_STATIC_TSRMLS_CACHE #define ZEND_TSRMG TSRMG_STATIC |