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/basic_functions.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/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index f17133f7e1..71c8604d6e 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -2156,12 +2156,10 @@ ZEND_BEGIN_ARG_INFO(arginfo_nl_langinfo, 0) ZEND_END_ARG_INFO() #endif -#ifdef HAVE_STRCOLL ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(arginfo_strcoll, IS_LONG, 0) ZEND_ARG_INFO(0, str1) ZEND_ARG_INFO(0, str2) ZEND_END_ARG_INFO() -#endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_trim, 0, 1, IS_STRING, 0) ZEND_ARG_INFO(0, str) @@ -2797,10 +2795,7 @@ static const zend_function_entry basic_functions[] = { /* {{{ */ PHP_FE(substr_compare, arginfo_substr_compare) PHP_FE(utf8_encode, arginfo_utf8_encode) PHP_FE(utf8_decode, arginfo_utf8_decode) - -#ifdef HAVE_STRCOLL PHP_FE(strcoll, arginfo_strcoll) -#endif #ifdef HAVE_STRFMON PHP_FE(money_format, arginfo_money_format) @@ -4133,10 +4128,10 @@ PHP_FUNCTION(getenv) #else tsrm_env_lock(); - + /* system method returns a const */ ptr = getenv(str); - + if (ptr) { RETVAL_STRING(ptr); } |