Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 01:53:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Apply NetBSD string conversion workaround to OpenBSD as well (#12618)

Browse Source
This commit is contained in:
Mantar 2022-07-31 06:18:19 -07:00 committed by GitHub
parent de509d05e6
commit 95d7fcb949
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/util/string.cpp
View File

@ -70,7 +70,7 @@ static bool convert(const char *to, const char *from, char *outbuf,
#ifdef __ANDROID__ #ifdef __ANDROID__
// On Android iconv disagrees how big a wchar_t is for whatever reason // On Android iconv disagrees how big a wchar_t is for whatever reason
const char *DEFAULT_ENCODING = "UTF-32LE"; 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. // NetBSD does not allow "WCHAR_T" as a charset input to iconv.
#include <sys/endian.h> #include <sys/endian.h>
#if BYTE_ORDER == BIG_ENDIAN #if BYTE_ORDER == BIG_ENDIAN
@ -93,8 +93,8 @@ std::wstring utf8_to_wide(const std::string &input)
std::wstring out; std::wstring out;
out.resize(outbuf_size / sizeof(wchar_t)); out.resize(outbuf_size / sizeof(wchar_t));
#if defined(__ANDROID__) || defined(__NetBSD__) #if defined(__ANDROID__) || defined(__NetBSD__) || defined(__OpenBSD__)
SANITY_CHECK(sizeof(wchar_t) == 4); static_assert(sizeof(wchar_t) == 4, "Unexpected wide char size");
#endif #endif
char *outbuf = reinterpret_cast<char*>(&out[0]); char *outbuf = reinterpret_cast<char*>(&out[0]);