X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=includes%2FOSThreads.h;h=d79b9affc7586ab64dc290f28a5d3d5e538723d2;hp=f9af6c408c1bcfa0ae3e6a2d3ba2f37a3947e520;hb=87c93cf56c83abf0148c91d5972dbe65dc72c38a;hpb=e4fdc426413d178c86d3ba93702aad5eb17734bf

diff --git a/includes/OSThreads.h b/includes/OSThreads.h
index f9af6c4..d79b9af 100644
--- a/includes/OSThreads.h
+++ b/includes/OSThreads.h
@@ -14,6 +14,14 @@
 
 # if defined(HAVE_PTHREAD_H) && !defined(WANT_NATIVE_WIN32_THREADS)
 
+#if CMINUSMINUS
+
+#define ACQUIRE_LOCK(mutex) foreign "C" pthread_mutex_lock(mutex)
+#define RELEASE_LOCK(mutex) foreign "C" pthread_mutex_unlock(mutex)
+#define ASSERT_LOCK_HELD(mutex) /* nothing */
+
+#else
+
 #include <pthread.h>
 
 typedef pthread_cond_t  Condition;
@@ -68,7 +76,21 @@ typedef pthread_key_t   ThreadLocalKey;
 
 #endif
 
+#endif // CMINUSMINUS
+
 # elif defined(HAVE_WINDOWS_H)
+
+#if CMINUSMINUS
+
+/* We jump through a hoop here to get a CCall EnterCriticalSection
+   and LeaveCriticalSection, as that's what C-- wants. */
+
+#define ACQUIRE_LOCK(mutex) foreign "stdcall" EnterCriticalSection(mutex)
+#define RELEASE_LOCK(mutex) foreign "stdcall" LeaveCriticalSection(mutex)
+#define ASSERT_LOCK_HELD(mutex) /* nothing */
+
+#else
+
 #include <windows.h>
 
 typedef HANDLE Condition;
@@ -133,10 +155,14 @@ typedef HANDLE Mutex;
 #define ASSERT_LOCK_HELD(mutex) /* nothing */
 #endif
 
+#endif // CMINUSMINUS
+
 # else
 #  error "Threads not supported"
 # endif
 
+
+#ifndef CMINUSMINUS
 //
 // General thread operations
 //
@@ -172,6 +198,9 @@ extern void closeMutex            ( Mutex* pMut );
 void  newThreadLocalKey (ThreadLocalKey *key);
 void *getThreadLocalVar (ThreadLocalKey *key);
 void  setThreadLocalVar (ThreadLocalKey *key, void *value);
+void  freeThreadLocalKey (ThreadLocalKey *key);
+
+#endif // !CMINUSMINUS
 
 #else