diff options
| author | Xinchen Hui <laruence@php.net> | 2015-06-05 11:54:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-06-05 11:54:53 +0800 |
| commit | d251ced225138381b61dfa5c5f682bbb28e309d9 (patch) | |
| tree | 09e2ed71bfb4d647719ac02a5c283cdfbc8db5af /Zend/zend_operators.c | |
| parent | 497f9f2cda4e2f2281cfbde148e7408908261c63 (diff) | |
| parent | 7f39ee7159e500c7971da99a9cfdbdab0648e8f9 (diff) | |
| download | php-git-d251ced225138381b61dfa5c5f682bbb28e309d9.tar.gz | |
Merge branch 'master' of git.php.net:php-src
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 dc02c03899..aa20bcaf59 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1391,7 +1391,7 @@ ZEND_API int ZEND_FASTCALL bitwise_and_function(zval *result, zval *op1, zval *o } if (UNEXPECTED(Z_TYPE_P(op1) != IS_LONG)) { - ZEND_TRY_BINARY_OP1_OBJECT_OPERATION(ZEND_BW_AND, bitwise_or_function); + ZEND_TRY_BINARY_OP1_OBJECT_OPERATION(ZEND_BW_AND, bitwise_and_function); op1_lval = _zval_get_long_func(op1); } else { op1_lval = Z_LVAL_P(op1); @@ -1458,7 +1458,7 @@ ZEND_API int ZEND_FASTCALL bitwise_xor_function(zval *result, zval *op1, zval *o } if (UNEXPECTED(Z_TYPE_P(op1) != IS_LONG)) { - ZEND_TRY_BINARY_OP1_OBJECT_OPERATION(ZEND_BW_XOR, bitwise_or_function); + ZEND_TRY_BINARY_OP1_OBJECT_OPERATION(ZEND_BW_XOR, bitwise_xor_function); op1_lval = _zval_get_long_func(op1); } else { op1_lval = Z_LVAL_P(op1); |