summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorsimonmar@microsoft.com <unknown>2007-06-27 10:16:04 +0000
committersimonmar@microsoft.com <unknown>2007-06-27 10:16:04 +0000
commit65ff44face84ae30f1ddf7d009d51c1778f8c7d3 (patch)
treebe64f4c00484d47876683fec733bfb72ca2f16ef /includes
parent68f606a04198beb15b577ebc951d34a313710cdc (diff)
downloadhaskell-65ff44face84ae30f1ddf7d009d51c1778f8c7d3.tar.gz
FIX BUILD (on Windows): follow changes to make threaded RTS compile with -fasm
Diffstat (limited to 'includes')
-rw-r--r--includes/OSThreads.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/includes/OSThreads.h b/includes/OSThreads.h
index 32429b5794..9a3b5aa6c7 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