From 0e45876b89da5e8604ddaa9b18ae6f0b59143853 Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 18 Oct 2017 22:02:36 +0200 Subject: [PATCH] Fix compilation with MinGW --- src/Nazara/Core/Win32/ThreadImpl.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Nazara/Core/Win32/ThreadImpl.cpp b/src/Nazara/Core/Win32/ThreadImpl.cpp index cae997874..134e5472a 100644 --- a/src/Nazara/Core/Win32/ThreadImpl.cpp +++ b/src/Nazara/Core/Win32/ThreadImpl.cpp @@ -63,6 +63,7 @@ namespace Nz void ThreadImpl::SetThreadName(DWORD threadId, const char* threadName) { + #ifdef NAZARA_COMPILER_MSVC // https://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx constexpr DWORD MS_VC_EXCEPTION = 0x406D1388; @@ -72,8 +73,8 @@ namespace Nz info.dwThreadID = threadId; info.dwFlags = 0; -#pragma warning(push) -#pragma warning(disable: 6320 6322) + #pragma warning(push) + #pragma warning(disable: 6320 6322) __try { RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), reinterpret_cast(&info)); @@ -81,7 +82,10 @@ namespace Nz __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)