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 /ext/standard/array.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 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 0e580365bb..b1fe88514d 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -327,7 +327,6 @@ static int php_array_reverse_key_compare_string_natural(const void *a, const voi } /* }}} */ -#if HAVE_STRCOLL static int php_array_key_compare_string_locale(const void *a, const void *b) /* {{{ */ { Bucket *f = (Bucket *) a; @@ -355,7 +354,6 @@ static int php_array_reverse_key_compare_string_locale(const void *a, const void return php_array_key_compare_string_locale(b, a); } /* }}} */ -#endif /* Numbers are always smaller than strings int this function as it * anyway doesn't make much sense to compare two different data types. @@ -528,7 +526,6 @@ static int php_array_reverse_natural_case_compare(const void *a, const void *b) } /* }}} */ -#if HAVE_STRCOLL static int php_array_data_compare_string_locale(const void *a, const void *b) /* {{{ */ { Bucket *f; @@ -558,7 +555,6 @@ static int php_array_reverse_data_compare_string_locale(const void *a, const voi return php_array_data_compare_string_locale(b, a); } /* }}} */ -#endif static compare_func_t php_get_key_compare_func(zend_long sort_type, int reverse) /* {{{ */ { @@ -603,7 +599,6 @@ static compare_func_t php_get_key_compare_func(zend_long sort_type, int reverse) } break; -#if HAVE_STRCOLL case PHP_SORT_LOCALE_STRING: if (reverse) { return php_array_reverse_key_compare_string_locale; @@ -611,7 +606,6 @@ static compare_func_t php_get_key_compare_func(zend_long sort_type, int reverse) return php_array_key_compare_string_locale; } break; -#endif case PHP_SORT_REGULAR: default: @@ -669,7 +663,6 @@ static compare_func_t php_get_data_compare_func(zend_long sort_type, int reverse } break; -#if HAVE_STRCOLL case PHP_SORT_LOCALE_STRING: if (reverse) { return php_array_reverse_data_compare_string_locale; @@ -677,7 +670,6 @@ static compare_func_t php_get_data_compare_func(zend_long sort_type, int reverse return php_array_data_compare_string_locale; } break; -#endif case PHP_SORT_REGULAR: default: @@ -5687,9 +5679,7 @@ PHP_FUNCTION(array_multisort) case PHP_SORT_NUMERIC: case PHP_SORT_STRING: case PHP_SORT_NATURAL: -#if HAVE_STRCOLL case PHP_SORT_LOCALE_STRING: -#endif /* flag allowed here */ if (parse_state[MULTISORT_TYPE] == 1) { /* Save the flag and make sure then next arg is not the current flag. */ |