[project @ 2002-02-14 07:40:17 by sof]

win32: make it compile

diff --git a/ghc/rts/OSThreads.c b/ghc/rts/OSThreads.c
index 16a4ca1..a0d3ca8 100644 (file)
--- a/ghc/rts/OSThreads.c
+++ b/ghc/rts/OSThreads.c
@@ -171,7 +171,7 @@ startProcWrapper(void* pReal)
 }
 
 int
-createOSThread ( OSThreadId* pId, void (*startProc)(void*))
+createOSThread ( OSThreadId* pId, void (*startProc)(void))
 {
   
   return _beginthreadex ( NULL,  /* default security attributes */

diff --git a/ghc/rts/OSThreads.h b/ghc/rts/OSThreads.h
index 6f14d42..eb5d9e7 100644 (file)
--- a/ghc/rts/OSThreads.h
+++ b/ghc/rts/OSThreads.h
@@ -9,7 +9,7 @@
  * --------------------------------------------------------------------------*/
 #ifndef __OSTHREADS_H__
 #define __OSTHREADS_H__
-#if defined(RTS_SUPPORTS_THREADS) /*to the end */
+#if defined(RTS_SUPPORTS_THREADS) /* to the end */
 
 # if defined(HAVE_PTHREAD_H) && !defined(WANT_NATIVE_WIN32_THREADS)
 #  include <pthread.h>
@@ -33,9 +33,8 @@ typedef DWORD OSThreadId;
 #define INIT_MUTEX_VAR 0
 #define INIT_COND_VAR  0
 
-#define ACQURE_LOCK(mutex)    WaitForSingleObject(mutex,INFINITE)
-#define RELEASE_LOCK(mutex)   ReleaseMutex(handle)
-#define 
+#define ACQUIRE_LOCK(mutex)   WaitForSingleObject(mutex,INFINITE)
+#define RELEASE_LOCK(mutex)   ReleaseMutex(mutex)
 # else
 #  error "Threads not supported"
 # endif