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/php_string.h | |
| 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/php_string.h')
| -rw-r--r-- | ext/standard/php_string.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h index 53209f4485..0bf88cb741 100644 --- a/ext/standard/php_string.h +++ b/ext/standard/php_string.h @@ -91,9 +91,7 @@ PHP_FUNCTION(strpbrk); PHP_FUNCTION(substr_compare); PHP_FUNCTION(utf8_encode); PHP_FUNCTION(utf8_decode); -#ifdef HAVE_STRCOLL PHP_FUNCTION(strcoll); -#endif #if HAVE_STRFMON PHP_FUNCTION(money_format); #endif |