Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-11-09 12:49:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

2026-09-16 01:15:21

Browse source 
Signed-off-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie 2026-09-16 01:15:21 +00:00
parent fd34024f0e
commit caef97f84b
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/common/error.cpp
View file

@ -24,7 +24,7 @@ std::string NativeErrorToString(int e) {
DWORD res = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | DWORD res = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_IGNORE_INSERTS, FORMAT_MESSAGE_IGNORE_INSERTS,
nullptr, e, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), nullptr, e, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
reinterpret_cast<LPSTR>(&err_str), 1, nullptr); LPSTR(&err_str), 1, nullptr);
if (!res) { if (!res) {
return "(FormatMessageA failed to format error)"; return "(FormatMessageA failed to format error)";
} }
@ -32,9 +32,10 @@ std::string NativeErrorToString(int e) {
LocalFree(err_str); LocalFree(err_str);
return ret; return ret;
#else #else
char err_str[255]; char err_str[256];
#if defined(__ANDROID__) || \ // See https://github.com/llvm/llvm-project/blob/c8fdb5f8b93c3e1da5e2ff3ba8b18627d6147b51/openmp/runtime/src/kmp_i18n.cpp#L711
(defined(__GLIBC__) && (_GNU_SOURCE || (_POSIX_C_SOURCE < 200112L && _XOPEN_SOURCE < 600))) // musl doesn't provide a macro gate but defines strerror_r() even if _GNU_SOURCE is defined
#if defined(__managarm__) || (defined(__GLIBC__) || defined(__BIONIC__)) || defined(_GNU_SOURCE)
// Thread safe (GNU-specific) // Thread safe (GNU-specific)
const char* str = strerror_r(e, err_str, sizeof(err_str)); const char* str = strerror_r(e, err_str, sizeof(err_str));
return std::string(str); return std::string(str);