From: simonmar@microsoft.com <unknown>
Date: Wed, 27 Jun 2007 10:16:04 +0000 (+0000)
Subject: FIX BUILD (on Windows): follow changes to make threaded RTS compile with -fasm
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=65ff44face84ae30f1ddf7d009d51c1778f8c7d3

FIX BUILD (on Windows): follow changes to make threaded RTS compile with -fasm
---

diff --git a/includes/OSThreads.h b/includes/OSThreads.h
index 32429b5..9a3b5aa 100644
--- a/includes/OSThreads.h
+++ b/includes/OSThreads.h
@@ -79,6 +79,15 @@ typedef pthread_key_t   ThreadLocalKey;
 #endif // CMINUSMINUS
 
 # elif defined(HAVE_WINDOWS_H)
+
+#if CMINUSMINUS
+
+#define ACQUIRE_LOCK(mutex) EnterCriticalSection(mutex)
+#define RELEASE_LOCK(mutex) LeaveCriticalSection(mutex)
+#define ASSERT_LOCK_HELD(mutex) /* nothing */
+
+#else
+
 #include <windows.h>
 
 typedef HANDLE Condition;
@@ -143,6 +152,8 @@ typedef HANDLE Mutex;
 #define ASSERT_LOCK_HELD(mutex) /* nothing */
 #endif
 
+#endif // CMINUSMINUS
+
 # else
 #  error "Threads not supported"
 # endif