X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fplatform.h;h=50c1782c00c3b75e04762d3a8228e3e91a6f5350;hp=a925d5f70e2ba3c94c62010ccc5b44b7ab3464eb;hb=4c7a71a44bbe37a5e5dd971650c9b22790cae302;hpb=699f700162f410519e5510c667aebc9940d4e91e

diff --git a/src/platform.h b/src/platform.h
index a925d5f7..50c1782c 100644
--- a/src/platform.h
+++ b/src/platform.h
@@ -48,13 +48,12 @@ 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 <pthread.h>
 typedef pthread_mutex_t Lock;
 typedef pthread_cond_t WaitCondition;
 typedef pthread_t NativeHandle;
-typedef pthread_key_t ThreadLocalStorageKey;
 typedef void*(*pt_start_fn)(void*);
 
 #  define lock_init(x) pthread_mutex_init(&(x), NULL)
@@ -68,10 +67,6 @@ typedef void*(*pt_start_fn)(void*);
 #  define cond_timedwait(x,y,z) pthread_cond_timedwait(&(x),&(y),z)
 #  define thread_create(x,f,t) !pthread_create(&(x),NULL,(pt_start_fn)f,t)
 #  define thread_join(x) pthread_join(x, NULL)
-#  define tls_init(k) pthread_key_create(&k,NULL)
-#  define tls_get(k) pthread_getspecific(k)
-#  define tls_set(k,x) pthread_setspecific(k,x)
-#  define tls_destroy(k) pthread_key_delete(k)
 
 #else // Windows and MinGW
 
@@ -79,7 +74,7 @@ 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)
 #  define NOMINMAX // disable macros min() and max()
@@ -96,7 +91,9 @@ inline uint64_t time_to_msec(const sys_time_t& t) { return t.time * 1000LL + t.m
 typedef CRITICAL_SECTION Lock;
 typedef HANDLE WaitCondition;
 typedef HANDLE NativeHandle;
-typedef DWORD ThreadLocalStorageKey;
+
+// 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))
@@ -107,12 +104,8 @@ typedef DWORD ThreadLocalStorageKey;
 #  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); }
-#  define tls_init(k) do { k = TlsAlloc(); } while(0)
-#  define tls_get(k) TlsGetValue(k)
-#  define tls_set(k,x) TlsSetValue(k,x)
-#  define tls_destroy(k) TlsFree(k)
 
 #endif