X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fplatform.h;h=50c1782c00c3b75e04762d3a8228e3e91a6f5350;hp=64122618a4b5067b59bf04391d08cb91a38c0b6b;hb=55bd27b8f08a151128d7065fa2819aa3e9605299;hpb=c483ffc773c012b49f4ea2f5bd1d788c1f0dc4ac diff --git a/src/platform.h b/src/platform.h index 64122618..50c1782c 100644 --- a/src/platform.h +++ b/src/platform.h @@ -48,13 +48,13 @@ typedef unsigned __int64 uint64_t; 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; typedef pthread_cond_t WaitCondition; typedef pthread_t NativeHandle; -typedef void*(*start_fn)(void*); +typedef void*(*pt_start_fn)(void*); # define lock_init(x) pthread_mutex_init(&(x), NULL) # define lock_grab(x) pthread_mutex_lock(&(x)) @@ -65,7 +65,7 @@ typedef void*(*start_fn)(void*); # 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) -# define thread_create(x,f,t) !pthread_create(&(x),NULL,(start_fn)f,t) +# define thread_create(x,f,t) !pthread_create(&(x),NULL,(pt_start_fn)f,t) # define thread_join(x) pthread_join(x, NULL) #else // Windows and MinGW @@ -74,7 +74,7 @@ typedef void*(*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) # define NOMINMAX // disable macros min() and max() @@ -92,6 +92,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,7 +104,7 @@ 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