3 files changed, 51 insertions, 31 deletions

diff --git a/src/platform.h b/src/platform.h
index b92f7e0..ce9ece2 100644
--- a/src/platform.h
+++ b/src/platform.h
@@ -1,26 +1,32 @@
 #pragma once
 
-#if (defined _WIN32_WCE)
+#if (defined __MINGW32__) || (defined __MINGW64__) // detect mingw before windows, because mingw defines _WIN32
+#define PLATFORM_MINGW
+//#pragma message("PLATFORM_MINGW")
+#elif (defined _WIN32_WCE)
 #define PLATFORM_POCKETPC
+//#pragma message("PLATFORM_POCKETPC")
 #elif defined(_XBOX)
 #define PLATFORM_XBOX
+//#pragma message("PLATFORM_XBOX")
 #elif (defined _WIN32)
 #define PLATFORM_WIN32
+//#pragma message("PLATFORM_WIN32")
 #if !defined(NOMINMAX)
 #define NOMINMAX
 #endif // NOMINMAX
 #elif (defined __linux__)
 #define PLATFORM_LINUX
+//#pragma message("PLATFORM_LINUX")
 #elif (defined __APPLE__) && (defined __MACH__)
 #define PLATFORM_OSX
+//#pragma message("PLATFORM_OSX")
 #elif (defined __NetBSD__) || (defined __FreeBSD__) || (defined BSD)
 #define PLATFORM_BSD
 #elif (defined __QNX__)
 #define PLATFORM_QNX
 #elif (defined __CYGWIN__)
 #define PLATFORM_CYGWIN
-#elif (defined __MINGW32__) || (defined __MINGW64__)
-#define PLATFORM_MINGW
 #else
 #error "Unknown platform!"
 #endif
diff --git a/src/threading.cpp b/src/threading.cpp
index bedbcf8..3e594ff 100644
--- a/src/threading.cpp
+++ b/src/threading.cpp
@@ -86,7 +86,7 @@ THE SOFTWARE.
  * FAIL is for unexpected API return values - essentially programming
  * error in _this_ code.
  */
-#if defined(PLATFORM_XBOX) || defined(PLATFORM_WIN32) || defined(PLATFORM_POCKETPC)
+#if HAVE_WIN32
 static void FAIL(char const* funcname_, DWORD const rc_)
 {
 #if defined(PLATFORM_XBOX)
@@ -101,7 +101,7 @@ static void FAIL(char const* funcname_, DWORD const rc_)
 #endif              // _MSC_VER
     abort();
 }
-#endif // win32 build
+#endif // HAVE_WIN32
 
 /*---=== Threading ===---*/
 
@@ -136,7 +136,7 @@ void THREAD_SET_PRIORITY(std::thread& thread_, int prio_, [[maybe_unused]] bool
     // prio range [-3,+3] was checked by the caller
     // for some reason when building for mingw, native_handle() is an unsigned long long, but HANDLE is a void*
     // -> need a strong cast to make g++ happy
-    if (!SetThreadPriority((HANDLE)thread_.native_handle(), gs_prio_remap[prio_ + 3])) {
+    if (!SetThreadPriority(thread_.native_handle(), gs_prio_remap[prio_ + 3])) {
         FAIL("THREAD_SET_PRIORITY", GetLastError());
     }
 }
@@ -382,7 +382,7 @@ void THREAD_SET_PRIORITY(std::thread& thread_, int prio_, [[maybe_unused]] bool
     struct sched_param sp;
     // prio range [-3,+3] was checked by the caller
     sp.sched_priority = gs_prio_remap[prio_ + 3];
-    PT_CALL(pthread_setschedparam(static_cast<pthread_t>(thread_.native_handle()), _PRIO_MODE, &sp));
+    PT_CALL(pthread_setschedparam(thread_.native_handle(), _PRIO_MODE, &sp));
 }
 
 // #################################################################################################
@@ -398,6 +398,12 @@ void THREAD_SET_AFFINITY(unsigned int aff_)
 
 void THREAD_SET_AFFINITY(unsigned int aff_)
 {
+#if HAVE_WIN32 // "hybrid": Win32 API is available, and pthread too
+    // since pthread_setaffinity_np can be missing (for example mingw), use win32 api instead
+    if (!SetThreadAffinityMask(GetCurrentThread(), aff_)) {
+        FAIL("THREAD_SET_AFFINITY", GetLastError());
+    }
+#else // pure pthread
     int bit = 0;
 #ifdef __NetBSD__
     cpuset_t* cpuset = cpuset_create();
@@ -423,6 +429,7 @@ void THREAD_SET_AFFINITY(unsigned int aff_)
 #else
     PT_CALL(pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset));
 #endif
+#endif // PLATFORM_MINGW
 }
 
 #endif // __PROSPERO__
diff --git a/src/threading.hpp b/src/threading.hpp
index 044b5a4..912c28f 100644
--- a/src/threading.hpp
+++ b/src/threading.hpp
@@ -5,13 +5,38 @@
 #define THREADAPI_WINDOWS 1
 #define THREADAPI_PTHREAD 2
 
-#if (defined(PLATFORM_XBOX) || defined(PLATFORM_WIN32) || defined(PLATFORM_POCKETPC))
-// #pragma message ( "THREADAPI_WINDOWS" )
-#define THREADAPI THREADAPI_WINDOWS
-#else // (defined PLATFORM_WIN32) || (defined PLATFORM_POCKETPC)
-// #pragma message ( "THREADAPI_PTHREAD" )
+#if __has_include(<pthread.h>)
+#include <pthread.h>
+#define HAVE_PTHREAD 1
+//#pragma message("HAVE_PTHREAD")
+#else
+#define HAVE_PTHREAD 0
+#endif // <pthread.h>
+
+#if __has_include(<windows.h>)
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#define HAVE_WIN32 1
+//#pragma message("HAVE_WIN32")
+#elif __has_include(<xtl.h>)
+#include <xtl.h>
+#define HAVE_WIN32 1
+//#pragma message("HAVE_WIN32")
+#else // no <windows.h> nor <xtl.h>
+#define HAVE_WIN32 0
+#endif // <windows.h>
+
+#if HAVE_PTHREAD
+// unless proven otherwise, if pthread is available, let's assume that's what std::thread is using
 #define THREADAPI THREADAPI_PTHREAD
-#endif // (defined PLATFORM_WIN32) || (defined PLATFORM_POCKETPC)
+//#pragma message ( "THREADAPI_PTHREAD" )
+#elif HAVE_WIN32
+//#pragma message ( "THREADAPI_WINDOWS" )
+#define THREADAPI THREADAPI_WINDOWS
+#include <process.h>
+#else // unknown
+#error "unsupported threading API"
+#endif // unknown
 
 static constexpr int kThreadPrioDefault{ -999 };
 
@@ -19,18 +44,6 @@ static constexpr int kThreadPrioDefault{ -999 };
 // #################################################################################################
 #if THREADAPI == THREADAPI_WINDOWS
 
-#if defined(PLATFORM_XBOX)
-#include <xtl.h>
-#else // !PLATFORM_XBOX
-#define WIN32_LEAN_AND_MEAN
-// CONDITION_VARIABLE needs version 0x0600+
-// _WIN32_WINNT value is already defined by MinGW, but not by MSVC
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
-#endif // _WIN32_WINNT
-#include <windows.h>
-#endif // !PLATFORM_XBOX
-#include <process.h>
 
 /*
 #define XSTR(x) STR(x)
@@ -49,12 +62,6 @@ static constexpr int kThreadPrioMax{ +3 };
 
 // PThread (Linux, OS X, ...)
 
-// looks like some MinGW installations don't support PTW32_INCLUDE_WINDOWS_H, so let's include it ourselves, just in case
-#if defined(PLATFORM_WIN32)
-#include <windows.h>
-#endif // PLATFORM_WIN32
-#include <pthread.h>
-
 #if defined(PLATFORM_LINUX) && !defined(LINUX_SCHED_RR)
 static constexpr int kThreadPrioMin{ 0 };
 #else