X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FRts.h;h=3b5af21a0bdd1e03a0f5ac36b888f8b9afd35de2;hb=1828f852e0da737d285bfbfce3bfac26203f4ef5;hp=4e5947268f194ac46a85b84376f2d283b71c40ac;hpb=cace43e1d8a96e2eed803b8f45392d3772f14156;p=ghc-hetmet.git

diff --git a/ghc/includes/Rts.h b/ghc/includes/Rts.h
index 4e59472..3b5af21 100644
--- 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 */
 
 /* 
@@ -74,6 +70,30 @@ void _stgAssert (char *, unsigned int);
 
 #define doNothing() do { } while (0)
 
+#ifdef SMP
+#define USED_IF_SMP
+#define USED_IF_NOT_SMP STG_UNUSED
+#else
+#define USED_IF_SMP STG_UNUSED
+#define USED_IF_NOT_SMP
+#endif
+
+#ifdef DEBUG
+#define USED_IF_DEBUG
+#define USED_IF_NOT_DEBUG STG_UNUSED
+#else
+#define USED_IF_DEBUG STG_UNUSED
+#define USED_IF_NOT_DEBUG
+#endif
+
+#ifdef THREADED_RTS
+#define USED_IF_THREADS
+#define USED_IF_NOT_THREADS STG_UNUSED
+#else
+#define USED_IF_THREADS STG_UNUSED
+#define USED_IF_NOT_THREADS
+#endif
+
 /* -----------------------------------------------------------------------------
    Include everything STG-ish
    -------------------------------------------------------------------------- */
@@ -108,15 +128,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"