X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FRts.h;h=fb2a70bc229f2dd9c5db632ede17713bf6d12b0b;hb=ad455445e0c798e348a96a7a835c8d0ccf939e89;hp=96840bc01eb11e3f2de6430501e9de9aae7b72f1;hpb=c320276c4b23db92bc06e608292e8dd214f771e1;p=ghc-hetmet.git

diff --git a/ghc/includes/Rts.h b/ghc/includes/Rts.h
index 96840bc..fb2a70b 100644
--- a/ghc/includes/Rts.h
+++ b/ghc/includes/Rts.h
@@ -1,7 +1,6 @@
 /* -----------------------------------------------------------------------------
- * $Id: Rts.h,v 1.25 2004/08/21 12:47:17 panne Exp $
  *
- * (c) The GHC Team, 1998-1999
+ * (c) The GHC Team, 1998-2004
  *
  * Top-level include file for the RTS itself
  *
@@ -35,36 +34,10 @@ extern "C" {
 #endif
 
 /* Fix for mingw stat problem (done here so it's early enough) */
-#ifdef mingw32_TARGET_OS
+#ifdef mingw32_HOST_OS
 #define __MSVCRT__ 1
 #endif
 
-#if defined(__GNUC__)
-#define GNU_ATTRIBUTE(at) __attribute__((at))
-#else
-#define GNU_ATTRIBUTE(at)
-#endif
-
-#if __GNUC__ >= 3 
-#define GNUC3_ATTRIBUTE(at) __attribute__((at))
-#else
-#define GNUC3_ATTRIBUTE(at)
-#endif
-
-/* 
- * Empty structures isn't supported by all, so to define
- * empty structures, please protect the defn with an
- * #if SUPPORTS_EMPTY_STRUCTS. Similarly for use,
- * employ the macro MAYBE_EMPTY_STRUCT():
- *
- *     MAYBE_EMPTY_STRUCT(structFoo, fieldName);
- */
-#if SUPPORTS_EMPTY_STRUCTS
-# define MAYBE_EMPTY_STRUCT(a,b) a b;
-#else
-# define MAYBE_EMPTY_STRUCT(a,b) /* empty */
-#endif
-
 /*
  * We often want to know the size of something in units of an
  * StgWord... (rounded up, of course!)
@@ -84,13 +57,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 */
 
 /* 
@@ -154,6 +127,7 @@ void _stgAssert (char *, unsigned int);
 
 /* Runtime-system hooks */
 #include "Hooks.h"
+#include "RtsMessages.h"
 
 #include "ieee-flpt.h"
 
@@ -174,7 +148,7 @@ extern void      __decodeFloat  (MP_INT *man, I_ *_exp, StgFloat flt);
 #endif
 
 /* Initialising the whole adjustor thunk machinery. */
-extern rtsBool initAdjustor(void);
+extern void initAdjustor(void);
 
 extern void stg_exit(int n) GNU_ATTRIBUTE(__noreturn__);
 
@@ -196,14 +170,6 @@ extern void stg_exit(int n) GNU_ATTRIBUTE(__noreturn__);
 /* declarations for runtime flags/values */
 #define MAX_RTS_ARGS 32
 
-#ifdef _WIN32
-/* On the yucky side..suppress -Wmissing-declarations warnings when
- * including <windows.h>
- */
-extern void* GetCurrentFiber ( void );
-extern void* GetFiberData ( void );
-#endif
-
 /* -----------------------------------------------------------------------------
    Assertions and Debuggery
    -------------------------------------------------------------------------- */
@@ -239,30 +205,13 @@ extern void* GetFiberData ( void );
 #endif
 
 /* -----------------------------------------------------------------------------
-   Attributes
+   Useful macros and inline functions
    -------------------------------------------------------------------------- */
 
-#ifdef __GNUC__     /* Avoid spurious warnings                             */
-#if (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) || __GNUC__ >= 3
-#define STG_NORETURN  __attribute__ ((noreturn))
-#define STG_UNUSED    __attribute__ ((unused))
-#else
-#define STG_NORETURN  
-#define STG_UNUSED
-#endif
-#else
-#define STG_NORETURN  
-#define STG_UNUSED
-#endif
-
 #if defined(__GNUC__)
 #define SUPPORTS_TYPEOF
 #endif
 
-/* -----------------------------------------------------------------------------
-   Useful macros and inline functions
-   -------------------------------------------------------------------------- */
-
 #if defined(SUPPORTS_TYPEOF)
 #define stg_min(a,b) ({typeof(a) _a = (a), _b = (b); _a <= _b ? _a : _b; })
 #define stg_max(a,b) ({typeof(a) _a = (a), _b = (b); _a <= _b ? _b : _a; })