diff options
| author | Christopher Jones <sixd@php.net> | 2013-09-26 21:07:57 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-09-26 21:07:57 -0700 |
| commit | 8554800e7691f85275e650d0b88a3e4d35153e95 (patch) | |
| tree | 285ea30c97e16415100aa81f1b5bb30dc43456cc /Zend/zend_compile.h | |
| parent | eb8e63bd3cfdbd6ad537dbea5f001c0a1995a40d (diff) | |
| parent | 92fe33c57073ab565d94b22e2ee187433c62b28f (diff) | |
| download | php-git-8554800e7691f85275e650d0b88a3e4d35153e95.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
Don't track parameter number in separate znode
fix missing change from 'tcp_socket' to the more common 'server'
fix many parallel test issues
Diffstat (limited to 'Zend/zend_compile.h')
| -rw-r--r-- | Zend/zend_compile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 0e07029412..f9520c98ea 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -501,7 +501,7 @@ void zend_do_add_variable(znode *result, const znode *op1, const znode *op2 TSRM int zend_do_verify_access_types(const znode *current_access_type, const znode *new_modifier); void zend_do_begin_function_declaration(znode *function_token, znode *function_name, int is_method, int return_reference, znode *fn_flags_znode TSRMLS_DC); void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC); -void zend_do_receive_arg(zend_uchar op, znode *varname, const znode *offset, const znode *initialization, znode *class_type, zend_bool pass_by_reference, zend_bool is_variadic TSRMLS_DC); +void zend_do_receive_param(zend_uchar op, znode *varname, const znode *initialization, znode *class_type, zend_bool pass_by_reference, zend_bool is_variadic TSRMLS_DC); int zend_do_begin_function_call(znode *function_name, zend_bool check_namespace TSRMLS_DC); void zend_do_begin_method_call(znode *left_bracket TSRMLS_DC); void zend_do_clone(znode *result, const znode *expr TSRMLS_DC); |