X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmisc.cpp;h=a3b1b0324c8ee20357fb515294696d9b9befb240;hb=2608b9249d9c25a699c8db8725e35bd4ec0b65ab;hp=2fb5e816f0320f8a504afe8d8e961d10b2d6b5b2;hpb=808a312e1ce8cf20bd2ee668a05a246bf0e0f3b2;p=stockfish
diff --git a/src/misc.cpp b/src/misc.cpp
index 2fb5e816..a3b1b032 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -17,7 +17,7 @@
along with this program. If not, see .
*/
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(_WIN64)
#define _CRT_SECURE_NO_DEPRECATE
#define NOMINMAX // disable macros min() and max()
@@ -40,13 +40,10 @@
#endif
#include
-#include
-#include
#include
#include
#include
-#include "bitcount.h"
#include "misc.h"
#include "thread.h"
@@ -56,7 +53,7 @@ using namespace std;
/// date (in the format YYMMDD) is used as a version number.
static const string Version = "";
-static const string Tag = "";
+static const string Tag = "";
/// engine_info() returns the full name of the current Stockfish version.
@@ -116,7 +113,7 @@ void dbg_print() {
int system_time() {
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(_WIN64)
struct _timeb t;
_ftime(&t);
return int(t.time * 1000 + t.millitm);
@@ -132,7 +129,7 @@ int system_time() {
int cpu_count() {
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(_WIN64)
SYSTEM_INFO s;
GetSystemInfo(&s);
return std::min(int(s.dwNumberOfProcessors), MAX_THREADS);
@@ -156,9 +153,9 @@ 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.
-void timed_wait(WaitCondition* sleepCond, Lock* sleepLock, int msec) {
+void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
-#if defined(_MSC_VER)
+#if defined(_WIN32) || defined(_WIN64)
int tm = msec;
#else
struct timeval t;
@@ -191,11 +188,11 @@ void prefetch(char*) {}
void prefetch(char* addr) {
-#if defined(__INTEL_COMPILER) || defined(__ICL)
+# if defined(__INTEL_COMPILER) || defined(__ICL)
// This hack prevents prefetches to be optimized away by
// Intel compiler. Both MSVC and gcc seems not affected.
__asm__ ("");
-#endif
+# endif
_mm_prefetch(addr, _MM_HINT_T2);
_mm_prefetch(addr+64, _MM_HINT_T2); // 64 bytes ahead