diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-05-04 04:27:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-04 04:27:53 +0200 |
| commit | e2dc6f3225c732f3896a9adf1f3ffc60d2b4f28f (patch) | |
| tree | 66b1fe2619e1f6f7bc99c0f41f9a324a50af80c7 /Source/Core/Common/StringUtil.cpp | |
| parent | f709071d41c0dfba0aa2ea52bb2de496b07cecdd (diff) | |
| parent | 0859d2c4721d6f7748d60cd232f0006e0957ef2f (diff) | |
Merge pull request #12751 from guijan/improv-nbsd
improve NetBSD-specific code
Diffstat (limited to 'Source/Core/Common/StringUtil.cpp')
| -rw-r--r-- | Source/Core/Common/StringUtil.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index f960d6fcc6..4551600b4e 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -35,9 +35,6 @@ constexpr u32 CODEPAGE_SHIFT_JIS = 932; constexpr u32 CODEPAGE_WINDOWS_1252 = 1252; #else -#if defined(__NetBSD__) -#define LIBICONV_PLUG -#endif #include <errno.h> #include <iconv.h> #include <locale.h> @@ -528,13 +525,8 @@ std::string CodeTo(const char* tocode, const char* fromcode, std::basic_string_v while (src_bytes != 0) { size_t const iconv_result = -#if defined(__NetBSD__) - iconv(conv_desc, reinterpret_cast<const char**>(&src_buffer), &src_bytes, &dst_buffer, - &dst_bytes); -#else iconv(conv_desc, const_cast<char**>(reinterpret_cast<const char**>(&src_buffer)), &src_bytes, &dst_buffer, &dst_bytes); -#endif if ((size_t)-1 == iconv_result) { if (EILSEQ == errno || EINVAL == errno) |