X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc.cpp;h=4d91c0fbb11ef8e4e2ba20a434b086400761e4e3;hb=939b621e5c67e9ef89b409fd773d38058341906c;hp=5e851f12f6ded08dfdebb1c967e12bd822b30367;hpb=d58176bfead421088bb3543b3cb6d1c359a3c91b;p=stockfish diff --git a/src/misc.cpp b/src/misc.cpp index 5e851f12..4d91c0fb 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -17,7 +17,14 @@ along with this program. If not, see . */ -#if !defined(_MSC_VER) +#if defined(_MSC_VER) + +#define _CRT_SECURE_NO_DEPRECATE +#define NOMINMAX // disable macros min() and max() +#include +#include + +#else # include # include @@ -26,13 +33,6 @@ # include # endif -#else - -#define _CRT_SECURE_NO_DEPRECATE -#define NOMINMAX // disable macros min() and max() -#include -#include - #endif #if !defined(NO_PREFETCH) @@ -178,18 +178,13 @@ int cpu_count() { /// timed_wait() waits for msec milliseconds. It is mainly an helper to wrap /// conversion from milliseconds to struct timespec, as used by pthreads. -#if defined(_MSC_VER) - void timed_wait(WaitCondition* sleepCond, Lock* sleepLock, int msec) { - cond_timedwait(sleepCond, sleepLock, msec); -} +#if defined(_MSC_VER) + int tm = msec; #else - -void timed_wait(WaitCondition* sleepCond, Lock* sleepLock, int msec) { - struct timeval t; - struct timespec abstime; + struct timespec abstime, *tm = &abstime; gettimeofday(&t, NULL); @@ -201,12 +196,11 @@ void timed_wait(WaitCondition* sleepCond, Lock* sleepLock, int msec) { abstime.tv_sec += 1; abstime.tv_nsec -= 1000000000LL; } +#endif - cond_timedwait(sleepCond, sleepLock, &abstime); + cond_timedwait(sleepCond, sleepLock, tm); } -#endif - /// prefetch() preloads the given address in L1/L2 cache. This is a non /// blocking function and do not stalls the CPU waiting for data to be