diff options
| author | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2023-06-21 00:00:00 +0000 |
|---|---|---|
| committer | Igor Pavlov <87184205+ip7z@users.noreply.github.com> | 2023-12-17 14:59:19 +0500 |
| commit | 5b39dc76f1bc82f941d5c800ab9f34407a06b53a (patch) | |
| tree | fe5e17420300b715021a76328444088d32047963 /CPP/Common/StringConvert.cpp | |
| parent | 93be7d4abfd4233228f58ee1fbbcd76d91be66a4 (diff) | |
| download | 7zip-23.01.tar.gz 7zip-23.01.tar.bz2 7zip-23.01.zip | |
23.0123.01
Diffstat (limited to '')
| -rw-r--r-- | CPP/Common/StringConvert.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/CPP/Common/StringConvert.cpp b/CPP/Common/StringConvert.cpp index c0bde0f..f25396a 100644 --- a/CPP/Common/StringConvert.cpp +++ b/CPP/Common/StringConvert.cpp | |||
| @@ -534,6 +534,7 @@ AString UnicodeStringToMultiByte(const UString &src, UINT codePage) | |||
| 534 | 534 | ||
| 535 | 535 | ||
| 536 | 536 | ||
| 537 | #if !defined(_WIN32) || defined(ENV_HAVE_LOCALE) | ||
| 537 | 538 | ||
| 538 | #ifdef _WIN32 | 539 | #ifdef _WIN32 |
| 539 | #define U_to_A(a, b, c) UnicodeStringToMultiByte2 | 540 | #define U_to_A(a, b, c) UnicodeStringToMultiByte2 |
| @@ -544,8 +545,6 @@ AString UnicodeStringToMultiByte(const UString &src, UINT codePage) | |||
| 544 | // #define A_to_U(a, b, c) MultiByteToUnicodeString2_Native(a, b) | 545 | // #define A_to_U(a, b, c) MultiByteToUnicodeString2_Native(a, b) |
| 545 | #endif | 546 | #endif |
| 546 | 547 | ||
| 547 | #if !defined(_WIN32) || defined(ENV_HAVE_LOCALE) | ||
| 548 | |||
| 549 | bool IsNativeUTF8() | 548 | bool IsNativeUTF8() |
| 550 | { | 549 | { |
| 551 | UString u; | 550 | UString u; |