diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-01-04 14:13:08 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-01-04 14:13:08 +0800 |
| commit | 2bac0452145604e3a8e1bd557dbf0aef09fc5222 (patch) | |
| tree | 9fcce9363434960e3b082ffe0051d8ddfc57b37a /win32/codepage.h | |
| parent | ec69cb664fa67acde35aa2fe3872f34269057940 (diff) | |
| parent | 6687e8db151907dab2447e5baa81693bcff98612 (diff) | |
| download | php-git-2bac0452145604e3a8e1bd557dbf0aef09fc5222.tar.gz | |
Merge branch 'clean-up' of https://github.com/carusogabriel/php-src
* 'clean-up' of https://github.com/carusogabriel/php-src:
Trailing whitespaces on Zend
Trailing whitespaces on win32
Trailing whitespaces on sapi/*
Trailing whitespaces on ext/*
Diffstat (limited to 'win32/codepage.h')
| -rw-r--r-- | win32/codepage.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/codepage.h b/win32/codepage.h index 9cfe3cd80b..cf3d72e39b 100644 --- a/win32/codepage.h +++ b/win32/codepage.h @@ -84,8 +84,8 @@ __forceinline static wchar_t *php_win32_cp_conv_any_to_w(const char* in, size_t if (php_win32_cp_use_unicode()) { /* First try the pure ascii conversion. This is the fastest way to do the - thing. Only applicable if the source string is UTF-8 in general. - While it could possibly be ok with European encodings, usage with + thing. Only applicable if the source string is UTF-8 in general. + While it could possibly be ok with European encodings, usage with Asian encodings can cause unintended side effects. Lookup the term "mojibake" if need more. */ ret = php_win32_cp_conv_ascii_to_w(in, in_len, out_len); @@ -97,7 +97,7 @@ __forceinline static wchar_t *php_win32_cp_conv_any_to_w(const char* in, size_t /* Still need this fallback with regard to possible broken data in the existing scripts. Broken data might be hardcoded in the user scripts, as UTF-8 settings was de facto ignored in - older PHP versions. The fallback can be removed later for + older PHP versions. The fallback can be removed later for the sake of purity, keep now for BC reasons. */ if (!ret) { const struct php_win32_cp *acp = php_win32_cp_get_by_id(GetACP()); |
