From eb82ab2e9993111bd6137db73b77d2ce41cf891a Mon Sep 17 00:00:00 2001
From: Benoit Germain <bnt.germain@gmail.com>
Date: Sat, 16 Nov 2013 10:32:46 +0100
Subject: Fix some compiler-specific build issues

---
 src/threading.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/threading.h b/src/threading.h
index 7d94f26..aed5b27 100644
--- a/src/threading.h
+++ b/src/threading.h
@@ -64,7 +64,9 @@ enum e_status { PENDING, RUNNING, WAITING, DONE, ERROR_ST, CANCELLED };
   #else // !PLATFORM_XBOX
     #define WIN32_LEAN_AND_MEAN
     // 'SignalObjectAndWait' needs this (targets Windows 2000 and above)
+    #ifndef _WIN32_WINNT // already defined by TDSM-Mingw64, so avoid a warning in that case
     #define _WIN32_WINNT 0x0400
+    #endif // _WIN32_WINNT
     #include <windows.h>
   #endif // !PLATFORM_XBOX
   #include <process.h>
@@ -111,7 +113,11 @@ enum e_status { PENDING, RUNNING, WAITING, DONE, ERROR_ST, CANCELLED };
 	#define THREAD_CALLCONV __stdcall
 #else // THREADAPI == THREADAPI_PTHREAD
   // 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>
 
   #ifdef PLATFORM_LINUX
-- 
cgit v1.2.3-55-g6feb