diff options
| author | George Peter Banyard <girgias@php.net> | 2020-03-29 01:10:15 +0100 |
|---|---|---|
| committer | George Peter Banyard <girgias@php.net> | 2020-03-31 00:14:56 +0200 |
| commit | 457380cae7813a4a34faa1f9a49fa121395fe290 (patch) | |
| tree | a5c0b8a34894a881782ed0612279841776f8960f /ext/standard/php_string.h | |
| parent | aa47543cb46a14525a69dc64385019b6c1d8583b (diff) | |
| download | php-git-457380cae7813a4a34faa1f9a49fa121395fe290.tar.gz | |
Drop wchar header check as always defined since C95
Diffstat (limited to 'ext/standard/php_string.h')
| -rw-r--r-- | ext/standard/php_string.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h index 9e94910bf3..7492902c99 100644 --- a/ext/standard/php_string.h +++ b/ext/standard/php_string.h @@ -136,12 +136,9 @@ 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_MBLEN -# define php_mblen(ptr, len) 1 -# define php_mb_reset() -#elif defined(_REENTRANT) && defined(HAVE_MBRLEN) && defined(HAVE_MBSTATE_T) +#if defined(_REENTRANT) # ifdef PHP_WIN32 -# include <wchar.h> +# include <wchar.h> # endif # define php_mblen(ptr, len) ((int) mbrlen(ptr, len, &BG(mblen_state))) # define php_mb_reset() memset(&BG(mblen_state), 0, sizeof(BG(mblen_state))) |