1 files changed, 22 insertions, 8 deletions

diff --git a/src/threading.h b/src/threading.h
index 1b218b9..e559910 100644
--- a/src/threading.h
+++ b/src/threading.h
@@ -64,7 +64,7 @@ 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)
-    #define _WIN32_WINNT 0x0400
+    //#define _WIN32_WINNT 0x0500 Let the compiler decide depending on the host OS
     #include <windows.h>
   #endif // !PLATFORM_XBOX
   #include <process.h>
@@ -74,17 +74,31 @@ enum e_status { PENDING, RUNNING, WAITING, DONE, ERROR_ST, CANCELLED };
   // CRITICAL_SECTION can be used for simple code protection. Mutexes are
   // needed for use with the SIGNAL system.
   //
-  #define MUTEX_T HANDLE
-  void MUTEX_INIT( MUTEX_T *ref );
+
+        #if WINVER <= 0x0400 // Windows NT4: use a signal
+
+        #define SIGNAL_T HANDLE
+        #define MUTEX_T HANDLE
+        void MUTEX_INIT( MUTEX_T* ref);
+        void MUTEX_FREE( MUTEX_T* ref);
+        void MUTEX_LOCK( MUTEX_T* ref);
+        void MUTEX_UNLOCK( MUTEX_T* ref);
+
+        #else // Vista and above: use a condition variable
+
+        #define SIGNAL_T CONDITION_VARIABLE
+        #define MUTEX_T CRITICAL_SECTION
+        #define MUTEX_INIT( ref) InitializeCriticalSection( ref)
+        #define MUTEX_FREE( ref) DeleteCriticalSection( ref)
+        #define MUTEX_LOCK( ref) EnterCriticalSection( ref)
+        #define MUTEX_UNLOCK( ref) LeaveCriticalSection( ref)
+
+        #endif // // Vista and above
+
   #define MUTEX_RECURSIVE_INIT(ref)  MUTEX_INIT(ref)  /* always recursive in Win32 */
-  void MUTEX_FREE( MUTEX_T *ref );
-  void MUTEX_LOCK( MUTEX_T *ref );
-  void MUTEX_UNLOCK( MUTEX_T *ref );
 
   typedef unsigned int THREAD_RETURN_T;
 
-  #define SIGNAL_T HANDLE
-
   #define YIELD() Sleep(0)
         #define THREAD_CALLCONV __stdcall
 #else // THREADAPI == THREADAPI_PTHREAD