diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-03-28 02:11:22 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-03-28 02:11:22 +0400 |
| commit | ea85451b65b904d0670c4011c819a15431720432 (patch) | |
| tree | 83bde21b41665b493d7337ff34d622f67cd5c78c /Zend/zend.h | |
| parent | 68385716a4bb233ba17acb587b0a7aa5d2e3d448 (diff) | |
| download | php-git-ea85451b65b904d0670c4011c819a15431720432.tar.gz | |
Refactored data structures to keep zend_object* instead of a whole zval in some places
Diffstat (limited to 'Zend/zend.h')
| -rw-r--r-- | Zend/zend.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index 28c31a3987..9f41978b1f 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -286,8 +286,13 @@ typedef enum { #include "zend_hash.h" #include "zend_llist.h" -#define INTERNAL_FUNCTION_PARAMETERS zend_uint param_count, zval *return_value, zval *this_ptr, int return_value_used TSRMLS_DC -#define INTERNAL_FUNCTION_PARAM_PASSTHRU param_count, return_value, this_ptr, return_value_used TSRMLS_CC +#define INTERNAL_FUNCTION_PARAMETERS zend_uint param_count, zval *return_value TSRMLS_DC +#define INTERNAL_FUNCTION_PARAM_PASSTHRU param_count, return_value TSRMLS_CC + +#define USED_RET() \ + (!EG(current_execute_data) || \ + !EG(current_execute_data)->opline || \ + !(EG(current_execute_data)->opline->result_type & EXT_TYPE_UNUSED)) #if defined(__GNUC__) && __GNUC__ >= 3 && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) && !defined(__osf__) void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((noreturn)); |