diff options
author | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-02-05 22:45:45 +0100 |
---|---|---|
committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-02-05 22:50:18 +0100 |
commit | ca6ef58b1ee8521e4b940ee4883dee714960e413 (patch) | |
tree | 8532add455224b07c07a759e3d906f50c0695888 /src/OSSupport/Errors.cpp | |
parent | Merge pull request #2972 from marvinkopf/PlayerAutoComplete (diff) | |
download | cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.gz cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.bz2 cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.lz cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.xz cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.zst cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.zip |
Diffstat (limited to '')
-rw-r--r-- | src/OSSupport/Errors.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/OSSupport/Errors.cpp b/src/OSSupport/Errors.cpp index ce2e2acb0..a05650111 100644 --- a/src/OSSupport/Errors.cpp +++ b/src/OSSupport/Errors.cpp @@ -17,37 +17,37 @@ AString GetOSErrorString( int a_ErrNo) Out.erase(Out.length() - 2); } return Out; - + #else // _WIN32 - + // According to http://linux.die.net/man/3/strerror_r there are two versions of strerror_r(): - + #if defined(__GLIBC__) && defined( _GNU_SOURCE) && !defined(ANDROID_NDK) // GNU version of strerror_r() - + char * res = strerror_r( errno, buffer, ARRAYCOUNT(buffer)); if (res != nullptr) { Printf(Out, "%d: %s", a_ErrNo, res); return Out; } - + #else // XSI version of strerror_r(): - + int res = strerror_r( errno, buffer, ARRAYCOUNT(buffer)); if (res == 0) { Printf(Out, "%d: %s", a_ErrNo, buffer); return Out; } - + #endif // strerror_r() version - + else { Printf(Out, "Error %d while getting error string for error #%d!", errno, a_ErrNo); return Out; } - + #endif // else _WIN32 } |