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

Core: Fix compilation with MinGW MCF threads

Browse Source
This commit is contained in:
SirLynix
2023-07-22 12:25:40 +02:00
parent caaaf606d3
commit 6370e0d16d
3 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@
namespace Nz::PlatformImpl
{
#ifndef NAZARA_COMPILER_MINGW
#ifndef NAZARA_COMPILER_MINGW_THREADS_POSIX
namespace NAZARA_ANONYMOUS_NAMESPACE
{
// Windows 10, version 1607 added GetThreadDescription and SetThreadDescription in order to name a thread
@@ -32,7 +32,7 @@ namespace Nz::PlatformImpl
ThreadHandle GetCurrentThreadHandle()
{
#ifndef NAZARA_COMPILER_MINGW
#ifndef NAZARA_COMPILER_MINGW_THREADS_POSIX
return ::GetCurrentThread();
#else
return ::pthread_self();
@@ -46,7 +46,7 @@ namespace Nz::PlatformImpl
std::string GetThreadName(ThreadHandle threadHandle)
{
#ifndef NAZARA_COMPILER_MINGW
#ifndef NAZARA_COMPILER_MINGW_THREADS_POSIX
NAZARA_USE_ANONYMOUS_NAMESPACE
// Use GetThreadDescription if available
@@ -70,7 +70,7 @@ namespace Nz::PlatformImpl
#endif
}
#ifndef NAZARA_COMPILER_MINGW
#ifndef NAZARA_COMPILER_MINGW_THREADS_POSIX
void RaiseThreadNameException(DWORD threadId, const char* threadName)
{
#ifdef NAZARA_COMPILER_MSVC
@@ -111,7 +111,7 @@ namespace Nz::PlatformImpl
void SetThreadName(ThreadHandle threadHandle, const char* threadName)
{
#ifndef NAZARA_COMPILER_MINGW
#ifndef NAZARA_COMPILER_MINGW_THREADS_POSIX
NAZARA_USE_ANONYMOUS_NAMESPACE
// Try to use SetThreadDescription if available
@@ -126,6 +126,6 @@ namespace Nz::PlatformImpl
}
}
#ifndef NAZARA_COMPILER_MINGW
#ifndef NAZARA_COMPILER_MINGW_THREADS_POSIX
#include <Nazara/Core/AntiWindows.hpp>
#endif

15
src/Nazara/Core/Win32/ThreadImpl.hpp
View File

@@ -10,7 +10,20 @@
#include <NazaraUtils/Prerequisites.hpp>
#include <string>
// Try to identify MinGW thread flavor
#ifdef NAZARA_COMPILER_MINGW
#if defined(__USING_MCFGTHREAD__)
#define NAZARA_COMPILER_MINGW_THREADS_MCF
#elif defined(_REENTRANT)
#define NAZARA_COMPILER_MINGW_THREADS_POSIX
#else
#define NAZARA_COMPILER_MINGW_THREADS_WIN32
#endif
#endif
#ifdef NAZARA_COMPILER_MINGW_THREADS_POSIX
#include <pthread.h>
#else
#include <Windows.h>
@@ -18,7 +31,7 @@
namespace Nz::PlatformImpl
{
#ifdef NAZARA_COMPILER_MINGW
#ifdef NAZARA_COMPILER_MINGW_THREADS_POSIX
using ThreadHandle = pthread_t;
#else
using ThreadHandle = HANDLE;