X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flock.h;h=b64293cf71f8c014e36bd61722b44dca2c5b37bc;hb=90890844ade67d8081a5284700cc2ef3ebdbb62d;hp=334bc7c9b3fe6321f907067e80d938b9cd7c511f;hpb=f826923f8ecfb90ff6f95d89f89c0f75a2360726;p=stockfish
diff --git a/src/lock.h b/src/lock.h
index 334bc7c9..b64293cf 100644
--- a/src/lock.h
+++ b/src/lock.h
@@ -17,11 +17,9 @@
along with this program. If not, see .
*/
-
#if !defined(LOCK_H_INCLUDED)
#define LOCK_H_INCLUDED
-
#if !defined(_MSC_VER)
# include
@@ -40,9 +38,30 @@ typedef pthread_cond_t WaitCondition;
#else
+#define NOMINMAX // disable macros min() and max()
#define WIN32_LEAN_AND_MEAN
#include
#undef WIN32_LEAN_AND_MEAN
+#undef NOMINMAX
+
+// Default fast and race free locks and condition variables
+#if !defined(OLD_LOCKS)
+
+typedef SRWLOCK Lock;
+typedef CONDITION_VARIABLE WaitCondition;
+
+# define lock_init(x) InitializeSRWLock(x)
+# define lock_grab(x) AcquireSRWLockExclusive(x)
+# define lock_release(x) ReleaseSRWLockExclusive(x)
+# define lock_destroy(x) (x)
+# 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)
+
+// Fallback solution to build for Windows XP and older versions, note that
+// cond_wait() is racy between lock_release() and WaitForSingleObject().
+#else
typedef CRITICAL_SECTION Lock;
typedef HANDLE WaitCondition;
@@ -57,4 +76,6 @@ typedef HANDLE WaitCondition;
# define cond_wait(x,y) { lock_release(y); WaitForSingleObject(*x, INFINITE); lock_grab(y); }
#endif
+#endif
+
#endif // !defined(LOCK_H_INCLUDED)