diff options
Diffstat (limited to 'ext/standard/php_string.h')
| -rw-r--r-- | ext/standard/php_string.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h index 7e49b3ee3b..0bf88cb741 100644 --- a/ext/standard/php_string.h +++ b/ext/standard/php_string.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -91,14 +91,12 @@ 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 -#if defined(HAVE_LOCALECONV) && defined(ZTS) +#if defined(ZTS) PHP_MINIT_FUNCTION(localeconv); PHP_MSHUTDOWN_FUNCTION(localeconv); #endif @@ -114,23 +112,14 @@ PHP_MINIT_FUNCTION(string_intrin); #define strnatcasecmp(a, b) \ strnatcmp_ex(a, strlen(a), b, strlen(b), 1) PHPAPI int strnatcmp_ex(char const *a, size_t a_len, char const *b, size_t b_len, int fold_case); - -#ifdef HAVE_LOCALECONV PHPAPI struct lconv *localeconv_r(struct lconv *out); -#endif - PHPAPI char *php_strtoupper(char *s, size_t len); PHPAPI char *php_strtolower(char *s, size_t len); PHPAPI zend_string *php_string_toupper(zend_string *s); PHPAPI zend_string *php_string_tolower(zend_string *s); PHPAPI char *php_strtr(char *str, size_t len, const char *str_from, const char *str_to, size_t trlen); -#if ZEND_INTRIN_SSE4_2_FUNC_PTR -PHPAPI extern zend_string *(*php_addslashes)(zend_string *str); -PHPAPI extern void (*php_stripslashes)(zend_string *str); -#else PHPAPI zend_string *php_addslashes(zend_string *str); PHPAPI void php_stripslashes(zend_string *str); -#endif PHPAPI zend_string *php_addcslashes_str(const char *str, size_t len, char *what, size_t what_len); PHPAPI zend_string *php_addcslashes(zend_string *str, char *what, size_t what_len); PHPAPI void php_stripcslashes(zend_string *str); @@ -152,11 +141,6 @@ PHPAPI int string_natural_compare_function_ex(zval *result, zval *op1, zval *op2 PHPAPI int string_natural_compare_function(zval *result, zval *op1, zval *op2); PHPAPI int string_natural_case_compare_function(zval *result, zval *op1, zval *op2); -#ifndef HAVE_STRERROR -PHPAPI char *php_strerror(int errnum); -#define strerror php_strerror -#endif - #ifndef HAVE_MBLEN # define php_mblen(ptr, len) 1 # define php_mb_reset() |