diff options
| author | Xinchen Hui <laruence@php.net> | 2014-12-11 00:03:45 -0500 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-12-11 00:03:45 -0500 |
| commit | 882741639cce273cdb8730742dbba2c43361547c (patch) | |
| tree | a8b1dc84eacd8a243855147dc602e87422b91feb /Zend/zend_execute.c | |
| parent | bd5c5d372916375981f76ed7800b2f4600acae05 (diff) | |
| parent | 92a9477cc399c78f6570beec22b8f1408179aefe (diff) | |
| download | php-git-882741639cce273cdb8730742dbba2c43361547c.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 283de41f7b..fbe52fe95a 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -934,7 +934,7 @@ static zend_always_inline void zend_assign_to_object_dim(zval *retval, zval *obj } } -static void zend_binary_assign_op_obj_dim(zval *object, zval *property, zval *value, zval *retval, int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC)) +static void zend_binary_assign_op_obj_dim(zval *object, zval *property, zval *value, zval *retval, int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC) TSRMLS_DC) { zval *z; zval rv; |