From 95d7fcb9499d7f51a660847a5b5671925206883f Mon Sep 17 00:00:00 2001 From: Mantar Date: Sun, 31 Jul 2022 06:18:19 -0700 Subject: Apply NetBSD string conversion workaround to OpenBSD as well (#12618) --- src/util/string.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/util/string.cpp') diff --git a/src/util/string.cpp b/src/util/string.cpp index d70c26015..778e4d1e1 100644 --- a/src/util/string.cpp +++ b/src/util/string.cpp @@ -70,7 +70,7 @@ static bool convert(const char *to, const char *from, char *outbuf, #ifdef __ANDROID__ // On Android iconv disagrees how big a wchar_t is for whatever reason const char *DEFAULT_ENCODING = "UTF-32LE"; -#elif defined(__NetBSD__) +#elif defined(__NetBSD__) || defined(__OpenBSD__) // NetBSD does not allow "WCHAR_T" as a charset input to iconv. #include #if BYTE_ORDER == BIG_ENDIAN @@ -93,8 +93,8 @@ std::wstring utf8_to_wide(const std::string &input) std::wstring out; out.resize(outbuf_size / sizeof(wchar_t)); -#if defined(__ANDROID__) || defined(__NetBSD__) - SANITY_CHECK(sizeof(wchar_t) == 4); +#if defined(__ANDROID__) || defined(__NetBSD__) || defined(__OpenBSD__) + static_assert(sizeof(wchar_t) == 4, "Unexpected wide char size"); #endif char *outbuf = reinterpret_cast(&out[0]); -- cgit v1.2.3