OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 07:30:15 +00:00
Code Issues Projects Releases Wiki Activity

re-enabled GetLastErrorMsg

Browse Source
This commit is contained in:
ShizZy 2013-09-08 20:41:23 -04:00
parent 802504cc86
commit 7ea22ffcdb
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/common/src/misc.cpp
View File

@ -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;
}