[project @ 2005-11-25 13:56:16 by simonmar]

[ghc-hetmet.git] / ghc / includes / Rts.h

diff --git a/ghc/includes/Rts.h b/ghc/includes/Rts.h
index 4e59472..ebc2f23 100644 (file)
--- a/ghc/includes/Rts.h
+++ b/ghc/includes/Rts.h
@@ -29,10 +29,6 @@ extern "C" {
 #define FLEXIBLE_ARRAY 0
 #endif
 
-#if defined(SMP) || defined(THREADED_RTS)
-#define RTS_SUPPORTS_THREADS 1
-#endif
-
 /* Fix for mingw stat problem (done here so it's early enough) */
 #ifdef mingw32_HOST_OS
 #define __MSVCRT__ 1
@@ -57,13 +53,13 @@ extern "C" {
 #define ASSERT(predicate) /* nothing */
 #else
 
-void _stgAssert (char *, unsigned int);
+extern void _assertFail (char *, unsigned int);
 
 #define ASSERT(predicate)                      \
        if (predicate)                          \
            /*null*/;                           \
        else                                    \
-           _stgAssert(__FILE__, __LINE__)
+           _assertFail(__FILE__, __LINE__)
 #endif /* DEBUG */
 
 /* 
@@ -108,15 +104,12 @@ void _stgAssert (char *, unsigned int);
 
 /* Parallel information */
 #include "Parallel.h"
+#include "OSThreads.h"
+#include "SMP.h"
 
 /* STG/Optimised-C related stuff */
-#include "SMP.h"
 #include "Block.h"
 
-#ifdef SMP
-#include <pthread.h>
-#endif
-
 /* GNU mp library */
 #include "gmp.h"