X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Flock.h;h=e05db4696c2d4ac46b8cb1c1dbc6264635463426;hp=939b7da0ad544052b104ce04d0c1b13a92c02469;hb=d58176bfead421088bb3543b3cb6d1c359a3c91b;hpb=0fcda095df1caa860e8e3f3a714d5545ec9dc122

diff --git a/src/lock.h b/src/lock.h
index 939b7da0..e05db469 100644
--- a/src/lock.h
+++ b/src/lock.h
@@ -35,12 +35,15 @@ typedef pthread_cond_t WaitCondition;
 #  define cond_init(x) pthread_cond_init(x, NULL)
 #  define cond_signal(x) pthread_cond_signal(x)
 #  define cond_wait(x,y) pthread_cond_wait(x,y)
+#  define cond_timedwait(x,y,z) pthread_cond_timedwait(x,y,z)
 
 #else
 
+#define NOMINMAX // disable macros min() and max()
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #undef WIN32_LEAN_AND_MEAN
+#undef NOMINMAX
 
 // Default fast and race free locks and condition variables
 #if !defined(OLD_LOCKS)
@@ -55,7 +58,8 @@ typedef CONDITION_VARIABLE WaitCondition;
 #  define cond_destroy(x) (x)
 #  define cond_init(x) InitializeConditionVariable(x)
 #  define cond_signal(x) WakeConditionVariable(x)
-#  define cond_wait(x,y) SleepConditionVariableSRW(x, y, INFINITE,0)
+#  define cond_wait(x,y) SleepConditionVariableSRW(x,y,INFINITE,0)
+#  define cond_timedwait(x,y,z) SleepConditionVariableSRW(x,y,z,0)
 
 // Fallback solution to build for Windows XP and older versions, note that
 // cond_wait() is racy between lock_release() and WaitForSingleObject().
@@ -72,6 +76,8 @@ typedef HANDLE WaitCondition;
 #  define cond_destroy(x) CloseHandle(*x)
 #  define cond_signal(x) SetEvent(*x)
 #  define cond_wait(x,y) { lock_release(y); WaitForSingleObject(*x, INFINITE); lock_grab(y); }
+#  define cond_timedwait(x,y,z) { lock_release(y); WaitForSingleObject(*x,z); lock_grab(y); }
+
 #endif
 
 #endif