From e0b8a35937e5c93ce661e9a947bd2b5f68aa810f Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 19 Jul 2018 09:03:30 -0400
Subject: common/misc: Deduplicate code in GetLastErrorMsg()

Android and macOS have supported thread_local for quite a while, but
most importantly is that we don't even really need it. Instead of using
a thread-local buffer, we can just return a non-static buffer as a
std::string, avoiding the need for that quality entirely.
---
 src/common/common_funcs.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/common/common_funcs.h')

diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index 995938d0b..042c2c2aa 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <string>
+
 #if !defined(ARCHITECTURE_x86_64) && !defined(ARCHITECTURE_ARM)
 #include <cstdlib> // for exit
 #endif
@@ -90,7 +92,7 @@ __declspec(dllimport) void __stdcall DebugBreak(void);
 // Call directly after the command or use the error num.
 // This function might change the error code.
 // Defined in Misc.cpp.
-const char* GetLastErrorMsg();
+std::string GetLastErrorMsg();
 
 namespace Common {
 
-- 
cgit v1.2.3