diff options
| author |  ShizZy <shizzy@6bit.net> | 2013-09-08 20:41:23 -0400 |
|---|---|---|
| committer | ShizZy <shizzy@6bit.net> | 2013-09-08 20:41:23 -0400 |
| commit | 7ea22ffcdb7e716bd08de84ec9949130932e69e8 (patch) | |
| tree | 248f17607e162cbe46c7934eb14a47f4b32d5fca /src | |
| parent | 802504cc86933116deae4b6f16ee435a1f51eea7 (diff) | |
re-enabled GetLastErrorMsg
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/src/misc.cpp | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/src/common/src/misc.cpp b/src/common/src/misc.cpp index 719a98cb..5b9e38ff 100644 --- a/src/common/src/misc.cpp +++ b/src/common/src/misc.cpp @@ -4,6 +4,10 @@ #include "common.h" +#ifdef _WIN32 +#include <windows.h> +#endif + // Neither Android nor OS X support TLS #if defined(__APPLE__) || (ANDROID && __clang__) #define __thread @@ -12,22 +16,22 @@ // Generic function to get last error message. // Call directly after the command or use the error num. // This function might change the error code. -//const char* GetLastErrorMsg() -//{ -// static const size_t buff_size = 255; -// -//#ifdef _WIN32 -// static __declspec(thread) char err_str[buff_size] = {}; -// -// FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), -// MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), -// err_str, buff_size, NULL); -//#else -// static __thread char err_str[buff_size] = {}; -// -// // Thread safe (XSI-compliant) -// strerror_r(errno, err_str, buff_size); -//#endif -// -// return err_str; -//} +const char* GetLastErrorMsg() +{ + static const size_t buff_size = 255; + +#ifdef _WIN32 + static __declspec(thread) char err_str[buff_size] = {}; + + FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + err_str, buff_size, NULL); +#else + static __thread char err_str[buff_size] = {}; + + // Thread safe (XSI-compliant) + strerror_r(errno, err_str, buff_size); +#endif + + return err_str; +} |