summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-11-03 21:07:08 +0100
committerLioncash <mathew1800@gmail.com>2020-11-03 21:07:13 +0100
commitee21b5378ba87dafc6e4d84a19a94b53e71aeee2 (patch)
tree92fcd66f2ea754f40d7e5f1cc3238dc6470fe2fd
parentMerge pull request #4873 from lioncash/common-error (diff)
downloadyuzu-ee21b5378ba87dafc6e4d84a19a94b53e71aeee2.tar
yuzu-ee21b5378ba87dafc6e4d84a19a94b53e71aeee2.tar.gz
yuzu-ee21b5378ba87dafc6e4d84a19a94b53e71aeee2.tar.bz2
yuzu-ee21b5378ba87dafc6e4d84a19a94b53e71aeee2.tar.lz
yuzu-ee21b5378ba87dafc6e4d84a19a94b53e71aeee2.tar.xz
yuzu-ee21b5378ba87dafc6e4d84a19a94b53e71aeee2.tar.zst
yuzu-ee21b5378ba87dafc6e4d84a19a94b53e71aeee2.zip
-rw-r--r--externals/microprofile/microprofile.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h
index 5c381f002..a06f6457d 100644
--- a/externals/microprofile/microprofile.h
+++ b/externals/microprofile/microprofile.h
@@ -948,7 +948,11 @@ typedef HANDLE MicroProfileThread;
DWORD _stdcall ThreadTrampoline(void* pFunc)
{
MicroProfileThreadFunc F = (MicroProfileThreadFunc)pFunc;
- return (DWORD)F(0);
+
+ // The return value of F will always return a void*, however, this is for
+ // compatibility with pthreads. The underlying "address" of the pointer
+ // is always a 32-bit value, so this cast is safe to perform.
+ return static_cast<DWORD>(reinterpret_cast<uint64_t>(F(0)));
}
inline void MicroProfileThreadStart(MicroProfileThread* pThread, MicroProfileThreadFunc Func)