summaryrefslogtreecommitdiff
path: root/src/common/common_funcs.h
diff options
context:
space:
mode:
authorGravatar bunnei2018-07-19 10:00:48 -0700
committerGravatar GitHub2018-07-19 10:00:48 -0700
commitbbc31ba6afdd56194d36fc4c99e0e07f7499fe8a (patch)
treebc1017dd2ba9d2b7e540aeb13a4af1368b2bde86 /src/common/common_funcs.h
parentMerge pull request #708 from lioncash/xbyak (diff)
parentcommon/misc: Deduplicate code in GetLastErrorMsg() (diff)
downloadyuzu-bbc31ba6afdd56194d36fc4c99e0e07f7499fe8a.tar.gz
yuzu-bbc31ba6afdd56194d36fc4c99e0e07f7499fe8a.tar.xz
yuzu-bbc31ba6afdd56194d36fc4c99e0e07f7499fe8a.zip
Merge pull request #709 from lioncash/thread-local
common/misc: Deduplicate code in GetLastErrorMsg()
Diffstat (limited to 'src/common/common_funcs.h')
-rw-r--r--src/common/common_funcs.h4
1 files changed, 3 insertions, 1 deletions
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 @@
4 4
5#pragma once 5#pragma once
6 6
7#include <string>
8
7#if !defined(ARCHITECTURE_x86_64) && !defined(ARCHITECTURE_ARM) 9#if !defined(ARCHITECTURE_x86_64) && !defined(ARCHITECTURE_ARM)
8#include <cstdlib> // for exit 10#include <cstdlib> // for exit
9#endif 11#endif
@@ -90,7 +92,7 @@ __declspec(dllimport) void __stdcall DebugBreak(void);
90// Call directly after the command or use the error num. 92// Call directly after the command or use the error num.
91// This function might change the error code. 93// This function might change the error code.
92// Defined in Misc.cpp. 94// Defined in Misc.cpp.
93const char* GetLastErrorMsg(); 95std::string GetLastErrorMsg();
94 96
95namespace Common { 97namespace Common {
96 98