diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-04-04 18:18:52 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-04-04 18:18:52 +0300 |
| commit | 0deb6419e87ef6cf0a67fee3ff08e8b7c800b282 (patch) | |
| tree | b619d5f46b97470104095c423c4d2ac0b1f9dbf0 /Zend/zend_operators.h | |
| parent | c4d5d26df365193d7367f7df72874997d1327299 (diff) | |
| parent | 9038d5c6ee223027dde2e9e69e24e7d3c04e8af2 (diff) | |
| download | php-git-0deb6419e87ef6cf0a67fee3ff08e8b7c800b282.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Make is_identical() functions return zend_bool (instead of int)
Diffstat (limited to 'Zend/zend_operators.h')
| -rw-r--r-- | Zend/zend_operators.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index 1a2d1cf81c..f86b2c8c08 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -54,7 +54,7 @@ ZEND_API int ZEND_FASTCALL shift_left_function(zval *result, zval *op1, zval *op ZEND_API int ZEND_FASTCALL shift_right_function(zval *result, zval *op1, zval *op2); ZEND_API int ZEND_FASTCALL concat_function(zval *result, zval *op1, zval *op2); -ZEND_API int ZEND_FASTCALL zend_is_identical(zval *op1, zval *op2); +ZEND_API zend_bool ZEND_FASTCALL zend_is_identical(zval *op1, zval *op2); ZEND_API int ZEND_FASTCALL is_equal_function(zval *result, zval *op1, zval *op2); ZEND_API int ZEND_FASTCALL is_identical_function(zval *result, zval *op1, zval *op2); @@ -778,7 +778,7 @@ static zend_always_inline int fast_equal_check_string(zval *op1, zval *op2) return Z_LVAL(result) == 0; } -static zend_always_inline int fast_is_identical_function(zval *op1, zval *op2) +static zend_always_inline zend_bool fast_is_identical_function(zval *op1, zval *op2) { if (Z_TYPE_P(op1) != Z_TYPE_P(op2)) { return 0; @@ -788,7 +788,7 @@ static zend_always_inline int fast_is_identical_function(zval *op1, zval *op2) return zend_is_identical(op1, op2); } -static zend_always_inline int fast_is_not_identical_function(zval *op1, zval *op2) +static zend_always_inline zend_bool fast_is_not_identical_function(zval *op1, zval *op2) { if (Z_TYPE_P(op1) != Z_TYPE_P(op2)) { return 1; |