[project @ 2003-03-04 01:29:25 by sof]

win32/Ticker.c:startTicker(),
win32/IOManager.c:NewIOWorkerThread():
  pass in non-NULL pointer to _beginthreadex()'s outgoing thread ID arg.
  Needed to work with Win9x's impl of CreateThread().

diff --git a/ghc/rts/win32/IOManager.c b/ghc/rts/win32/IOManager.c
index 85bfcb0..ce3ee99 100644 (file)
--- a/ghc/rts/win32/IOManager.c
+++ b/ghc/rts/win32/IOManager.c
@@ -126,12 +126,13 @@ static
 BOOL
 NewIOWorkerThread(IOManagerState* iom)
 {
+  unsigned threadId;
   return ( 0 != _beginthreadex(NULL,
                               0,
                               IOWorkerProc,
                               (LPVOID)iom,
                               0,
-                              NULL) );
+                              &threadId) );
 }
 
 BOOL

diff --git a/ghc/rts/win32/Ticker.c b/ghc/rts/win32/Ticker.c
index bfc89c0..194ec8d 100644 (file)
--- a/ghc/rts/win32/Ticker.c
+++ b/ghc/rts/win32/Ticker.c
@@ -66,7 +66,7 @@ TimerProc(PVOID param)
 int
 startTicker(nat ms)
 {
-                           
+  unsigned threadId;
   /* 'hStopEvent' is a manual-reset event that's signalled upon
    * shutdown of timer service (=> timer thread.)
    */
@@ -82,7 +82,7 @@ startTicker(nat ms)
                               TimerProc,
                               (LPVOID)ms,
                               0,
-                              NULL) );
+                              &threadId) );
 }
 
 int