diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-06-28 00:13:25 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-06-28 00:13:25 +0200 |
| commit | 7f994990eab4ffc3eb8cddca413dc4bcd03e3457 (patch) | |
| tree | 417dd41f6cb9c2c8fbe558c2abc8dc3f923c94ef /Zend/zend_operators.c | |
| parent | 221494f4de02b8533e4081ca29b6c857c910f087 (diff) | |
| parent | 638c21765c029f637e45c00a3528ff8ea10c3b72 (diff) | |
| download | php-git-7f994990eab4ffc3eb8cddca413dc4bcd03e3457.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove HAVE_STRCOLL check
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 17e7434215..621e26c94b 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1944,7 +1944,6 @@ ZEND_API int ZEND_FASTCALL string_case_compare_function(zval *op1, zval *op2) /* } /* }}} */ -#if HAVE_STRCOLL ZEND_API int ZEND_FASTCALL string_locale_compare_function(zval *op1, zval *op2) /* {{{ */ { zend_string *tmp_str1, *tmp_str2; @@ -1957,7 +1956,6 @@ ZEND_API int ZEND_FASTCALL string_locale_compare_function(zval *op1, zval *op2) return ret; } /* }}} */ -#endif ZEND_API int ZEND_FASTCALL numeric_compare_function(zval *op1, zval *op2) /* {{{ */ { |