summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/common/src/misc.cpp42
1 files changed, 23 insertions, 19 deletions
diff --git a/src/common/src/misc.cpp b/src/common/src/misc.cpp
index 719a98cb9..5b9e38ffb 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;
+}