diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2009-08-03 13:19:33 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2009-08-03 13:19:33 +0000 |
| commit | 653e325e08c5f632aa194f9239e938faca5abba5 (patch) | |
| tree | faf00221c188234def4ae08f15949a3e42b90a34 | |
| parent | 4c083061fa937ca7d05211e516002d9e4c14af2d (diff) | |
| download | haskell-653e325e08c5f632aa194f9239e938faca5abba5.tar.gz | |
Windows build fixes
| -rw-r--r-- | includes/rts/Threads.h | 7 | ||||
| -rw-r--r-- | rts/Schedule.c | 1 | ||||
| -rw-r--r-- | rts/win32/AsyncIO.c | 1 | ||||
| -rw-r--r-- | rts/win32/ConsoleHandler.c | 2 | ||||
| -rw-r--r-- | rts/win32/OSMem.c | 3 | ||||
| -rw-r--r-- | rts/win32/Ticker.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/includes/rts/Threads.h b/includes/rts/Threads.h index 06a0ed11dc..4f343b804c 100644 --- 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 b3d523e111..70ddf090c1 100644 --- 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 1b57d37d34..8662e2a369 100644 --- 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 13011cbe26..19057a3d8d 100644 --- 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 4edb5bf2be..f61aadc762 100644 --- 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 599604e1c2..c1e20fb67c 100644 --- 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 |