sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation with MinGW

This commit is contained in:
Lynix 2017-10-18 22:02:36 +02:00
parent be38aee1fa
commit 0e45876b89
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Nazara/Core/Win32/ThreadImpl.cpp
View File

@ -63,6 +63,7 @@ namespace Nz
void ThreadImpl::SetThreadName(DWORD threadId, const char* threadName) void ThreadImpl::SetThreadName(DWORD threadId, const char* threadName)
{ {
#ifdef NAZARA_COMPILER_MSVC
// https://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx // https://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx
constexpr DWORD MS_VC_EXCEPTION = 0x406D1388; constexpr DWORD MS_VC_EXCEPTION = 0x406D1388;
@ -72,8 +73,8 @@ namespace Nz
info.dwThreadID = threadId; info.dwThreadID = threadId;
info.dwFlags = 0; info.dwFlags = 0;
#pragma warning(push) #pragma warning(push)
#pragma warning(disable: 6320 6322) #pragma warning(disable: 6320 6322)
__try __try
{ {
RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), reinterpret_cast<ULONG_PTR*>(&info)); RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), reinterpret_cast<ULONG_PTR*>(&info));
@ -81,7 +82,10 @@ namespace Nz
__except (EXCEPTION_EXECUTE_HANDLER) __except (EXCEPTION_EXECUTE_HANDLER)
{ {
} }
#pragma warning(pop) #pragma warning(pop)
#else
NazaraWarning("SetThreadName on Windows is only supported with MSVC for now");
#endif
} }
unsigned int __stdcall ThreadImpl::ThreadProc(void* userdata) unsigned int __stdcall ThreadImpl::ThreadProc(void* userdata)