diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-25 15:23:06 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-25 15:23:06 +0400 |
| commit | b965647e44c4574ba4c22bfc92b5b7f587451c9d (patch) | |
| tree | 2d0a144c7156edcbdca88b626ddd19447b87f0fb /Zend/zend_operators.c | |
| parent | cabfbf712850d31081f7a9d0ebe03576b6ae980b (diff) | |
| parent | 40a9132de8337f95aba153a5a6fcdb43eb02f681 (diff) | |
| download | php-git-b965647e44c4574ba4c22bfc92b5b7f587451c9d.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Conflicts:
Zend/zend_object_handlers.c
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 849f4d3bd3..2c3d657d0b 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1704,7 +1704,7 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* { } /* }}} */ -static int hash_zval_identical_function(const zval **z1, const zval **z2) /* {{{ */ +static int hash_zval_identical_function(const zval *z1, const zval *z2) /* {{{ */ { zval result; TSRMLS_FETCH(); @@ -1714,7 +1714,7 @@ static int hash_zval_identical_function(const zval **z1, const zval **z2) /* {{{ * whereas this comparison function is expected to return 0 on identity, * and non zero otherwise. */ - if (is_identical_function(&result, (zval *) *z1, (zval *) *z2 TSRMLS_CC)==FAILURE) { + if (is_identical_function(&result, z1, z2 TSRMLS_CC)==FAILURE) { return 1; } return !Z_LVAL(result); |