diff options
Diffstat (limited to 'testing/goxel/fix-musl.patch')
| -rw-r--r-- | testing/goxel/fix-musl.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/testing/goxel/fix-musl.patch b/testing/goxel/fix-musl.patch index 115ccb8e426..908107bb175 100644 --- a/testing/goxel/fix-musl.patch +++ b/testing/goxel/fix-musl.patch @@ -1,13 +1,13 @@ +diff --git a/ext_src/yocto/ext/filesystem.hpp b/ext_src/yocto/ext/filesystem.hpp +index 860f5b2..c41e0e7 100644 --- a/ext_src/yocto/ext/filesystem.hpp +++ b/ext_src/yocto/ext/filesystem.hpp -@@ -1531,8 +1531,8 @@ - return rc == 0 ? (const char*)buffer : "Error in strerror_r!"; - #else +@@ -1525,7 +1525,7 @@ GHC_INLINE std::string systemErrorText(ErrorNumber code = 0) + std::string msg = toUtf8(std::wstring((LPWSTR)msgBuf)); + LocalFree(msgBuf); + return msg; +-#elif defined(GHC_OS_MACOS) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)) || (defined(GHC_OS_ANDROID) && __ANDROID_API__ < 23) || defined(EMSCRIPTEN) ++#elif true || defined(GHC_OS_MACOS) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)) || (defined(GHC_OS_ANDROID) && __ANDROID_API__ < 23) || defined(EMSCRIPTEN) char buffer[512]; -- char* msg = strerror_r(code ? code : errno, buffer, sizeof(buffer)); -- return msg ? msg : buffer; -+ int msg = strerror_r(code ? code : errno, buffer, sizeof(buffer)); -+ return msg == 0 ? (const char*)buffer : "Error in strerror_r!"; - #endif - } - + int rc = strerror_r(code ? code : errno, buffer, sizeof(buffer)); + return rc == 0 ? (const char*)buffer : "Error in strerror_r!"; |