X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fplatform.h;h=e4b4d2ceaef144b90b2f6a40a159b1b4a7f23f6f;hb=002062ae934c1fae3e56157e8e7e6451b552ada5;hp=e002d2188f1bcf64e68ac70f5b9f0c006e6223d5;hpb=b1f57e92cea7bd36126ef8c26928d8991b74baef;p=stockfish
diff --git a/src/platform.h b/src/platform.h
index e002d218..e4b4d2ce 100644
--- a/src/platform.h
+++ b/src/platform.h
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,10 +17,10 @@
along with this program. If not, see .
*/
-#if !defined(PLATFORM_H_INCLUDED)
+#ifndef PLATFORM_H_INCLUDED
#define PLATFORM_H_INCLUDED
-#if defined(_MSC_VER)
+#ifdef _MSC_VER
// Disable some silly and noisy warning from MSVC compiler
#pragma warning(disable: 4127) // Conditional expression is constant
@@ -40,15 +40,16 @@ typedef unsigned __int64 uint64_t;
#else
# include
+# include // Used by sysconf(_SC_NPROCESSORS_ONLN)
#endif
-#if !defined(_WIN32) && !defined(_WIN64) // Linux - Unix
+#ifndef _WIN32 // Linux - Unix
# include
typedef timeval sys_time_t;
inline void system_time(sys_time_t* t) { gettimeofday(t, NULL); }
-inline uint64_t time_to_msec(const sys_time_t& t) { return t.tv_sec * 1000LL + t.tv_usec / 1000; }
+inline int64_t time_to_msec(const sys_time_t& t) { return t.tv_sec * 1000LL + t.tv_usec / 1000; }
# include
typedef pthread_mutex_t Lock;
@@ -74,9 +75,9 @@ typedef void*(*pt_start_fn)(void*);
typedef _timeb sys_time_t;
inline void system_time(sys_time_t* t) { _ftime(t); }
-inline uint64_t time_to_msec(const sys_time_t& t) { return t.time * 1000LL + t.millitm; }
+inline int64_t time_to_msec(const sys_time_t& t) { return t.time * 1000LL + t.millitm; }
-#if !defined(NOMINMAX)
+#ifndef NOMINMAX
# define NOMINMAX // disable macros min() and max()
#endif
@@ -92,6 +93,9 @@ typedef CRITICAL_SECTION Lock;
typedef HANDLE WaitCondition;
typedef HANDLE NativeHandle;
+// On Windows 95 and 98 parameter lpThreadId my not be null
+inline DWORD* dwWin9xKludge() { static DWORD dw; return &dw; }
+
# define lock_init(x) InitializeCriticalSection(&(x))
# define lock_grab(x) EnterCriticalSection(&(x))
# define lock_release(x) LeaveCriticalSection(&(x))
@@ -101,9 +105,9 @@ typedef HANDLE NativeHandle;
# 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); }
-# define thread_create(x,f,t) (x = CreateThread(NULL,0,(LPTHREAD_START_ROUTINE)f,t,0,NULL), x != NULL)
+# define thread_create(x,f,t) (x = CreateThread(NULL,0,(LPTHREAD_START_ROUTINE)f,t,0,dwWin9xKludge()), x != NULL)
# define thread_join(x) { WaitForSingleObject(x, INFINITE); CloseHandle(x); }
#endif
-#endif // !defined(PLATFORM_H_INCLUDED)
+#endif // #ifndef PLATFORM_H_INCLUDED