Windows build fixes

diff --git a/includes/rts/Threads.h b/includes/rts/Threads.h
index 06a0ed1..4f343b8 100644 (file)
--- a/includes/rts/Threads.h
+++ b/includes/rts/Threads.h
@@ -34,7 +34,14 @@ StgRegTable * resumeThread  (void *);
 //
 int    cmp_thread      (StgPtr tso1, StgPtr tso2);
 int    rts_getThreadId (StgPtr tso);
+
+#if !defined(mingw32_HOST_OS)
 pid_t  forkProcess     (HsStablePtr *entry);
+#else
+pid_t  forkProcess     (HsStablePtr *entry)
+    GNU_ATTRIBUTE(__noreturn__);
+#endif
+
 HsBool rtsSupportsBoundThreads (void);
 
 // The number of Capabilities

diff --git a/rts/Schedule.c b/rts/Schedule.c
index b3d523e..70ddf09 100644 (file)
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -1717,7 +1717,6 @@ forkProcess(HsStablePtr *entry
     }
 #else /* !FORKPROCESS_PRIMOP_SUPPORTED */
     barf("forkProcess#: primop not supported on this platform, sorry!\n");
-    return -1;
 #endif
 }
 

diff --git a/rts/win32/AsyncIO.c b/rts/win32/AsyncIO.c
index 1b57d37..8662e2a 100644 (file)
--- a/rts/win32/AsyncIO.c
+++ b/rts/win32/AsyncIO.c
@@ -12,7 +12,6 @@
 #include <windows.h>
 #include <stdio.h>
 #include "Schedule.h"
-#include "RtsFlags.h"
 #include "Capability.h"
 #include "win32/AsyncIO.h"
 #include "win32/IOManager.h"

diff --git a/rts/win32/ConsoleHandler.c b/rts/win32/ConsoleHandler.c
index 13011cb..19057a3 100644 (file)
--- a/rts/win32/ConsoleHandler.c
+++ b/rts/win32/ConsoleHandler.c
@@ -5,10 +5,8 @@
 #include "Rts.h"
 #include <windows.h>
 #include "ConsoleHandler.h"
-#include "SchedAPI.h"
 #include "Schedule.h"
 #include "RtsUtils.h"
-#include "RtsFlags.h"
 #include "AsyncIO.h"
 #include "RtsSignals.h"
 

diff --git a/rts/win32/OSMem.c b/rts/win32/OSMem.c
index 4edb5bf..f61aadc 100644 (file)
--- a/rts/win32/OSMem.c
+++ b/rts/win32/OSMem.c
@@ -7,9 +7,8 @@
  * ---------------------------------------------------------------------------*/
 
 #include "Rts.h"
-#include "OSMem.h"
+#include "sm/OSMem.h"
 #include "RtsUtils.h"
-#include "RtsMessages.h"
 
 #if HAVE_WINDOWS_H
 #include <windows.h>

diff --git a/rts/win32/Ticker.c b/rts/win32/Ticker.c
index 599604e..c1e20fb 100644 (file)
--- a/rts/win32/Ticker.c
+++ b/rts/win32/Ticker.c
@@ -3,12 +3,10 @@
  * 
  */
 #include "Rts.h"
-#include "Timer.h"
 #include "Ticker.h"
 #include <windows.h>
 #include <stdio.h>
 #include <process.h>
-#include "OSThreads.h"
 
 /*
  * Provide a timer service for the RTS, periodically