citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #5603 from FearlessTobi/port-4887 

Port yuzu-emu/yuzu#4887: "microprofile: Silence warning in headers"
This commit is contained in:
Marshall Mohror 2020-11-17 09:29:06 -06:00 committed by GitHub
parent 6772e46153 8f7ac4d8cc
commit 3115529be7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
externals/microprofile/microprofile.h vendored
View File

@ -927,7 +927,11 @@ typedef HANDLE MicroProfileThread;
DWORD _stdcall ThreadTrampoline(void* pFunc) DWORD _stdcall ThreadTrampoline(void* pFunc)
{ {
MicroProfileThreadFunc F = (MicroProfileThreadFunc)pFunc; MicroProfileThreadFunc F = (MicroProfileThreadFunc)pFunc;
return (uint32_t)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)));
} }
void MicroProfileThreadStart(MicroProfileThread* pThread, MicroProfileThreadFunc Func) void MicroProfileThreadStart(MicroProfileThread* pThread, MicroProfileThreadFunc Func)