5049fd0fbf
SetFlags.cmake Add -lexecinfo to linker flags for FreeBSD to resolve backtrace() lib/sqlite/CMakeLists.txt Define _XOPEN_SOURCE to 600 instead of __POSIX_VISIBLE to 200112 for POSIX 1-2001 support. For POSIX standards, the _XOPEN_SOURCE define controls the eventual value of __POSIX_VISIBLE. _XOPEN_SOURCE is defined to 500 in sqlite.c if not already defined, which sets up _POSIX_C_SOURCE and __POSIX_VISIBLE to the 199506 for POSIX.1c lib/tolua++/CMakeLists.txt src/CMakeLists.txt Add /usr/local/lib to the library search path for FreeBSD builds src/OSSupport/Errors.cpp Correct the strerror_r() implementation determination to check whether _GNU_SOURCE is defined, not what it evaluates to
54 lines
1.1 KiB
C++
54 lines
1.1 KiB
C++
|
|
#include "Globals.h"
|
|
|
|
#include "Errors.h"
|
|
|
|
AString GetOSErrorString( int a_ErrNo)
|
|
{
|
|
char buffer[ 1024 ];
|
|
AString Out;
|
|
|
|
#ifdef _WIN32
|
|
|
|
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, a_ErrNo, 0, buffer, ARRAYCOUNT(buffer), nullptr);
|
|
Printf(Out, "%d: %s", a_ErrNo, buffer);
|
|
if (!Out.empty() && (Out[Out.length() - 1] == '\n'))
|
|
{
|
|
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(__APPLE__) && 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
|
|
}
|
|
|