X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FRts.h;h=45bf815e8343acf3855815209d81f6d6ea44ce50;hb=153b9cb9b11e05c4edb1b6bc0a7b972660e41f70;hp=8d42730abf00533569fdc958f6ba2815d071f980;hpb=423d477bfecd490de1449c59325c8776f91d7aac;p=ghc-hetmet.git

diff --git a/ghc/includes/Rts.h b/ghc/includes/Rts.h
index 8d42730..45bf815 100644
--- a/ghc/includes/Rts.h
+++ b/ghc/includes/Rts.h
@@ -1,7 +1,6 @@
 /* -----------------------------------------------------------------------------
- * $Id: Rts.h,v 1.24 2004/08/13 13:09:27 simonmar Exp $
  *
- * (c) The GHC Team, 1998-1999
+ * (c) The GHC Team, 1998-2004
  *
  * Top-level include file for the RTS itself
  *
@@ -35,7 +34,7 @@ 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
 
@@ -51,19 +50,7 @@ extern "C" {
 #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
+#define STG_UNUSED    GNUC3_ATTRIBUTE(__unused__)
 
 /*
  * We often want to know the size of something in units of an
@@ -154,6 +141,7 @@ void _stgAssert (char *, unsigned int);
 
 /* Runtime-system hooks */
 #include "Hooks.h"
+#include "RtsMessages.h"
 
 #include "ieee-flpt.h"
 
@@ -173,14 +161,8 @@ extern void      __decodeFloat  (MP_INT *man, I_ *_exp, StgFloat flt);
 #include "DNInvoke.h"
 #endif
 
-/* Creating and destroying an adjustor thunk and initialising the whole
-   adjustor thunk machinery. I cannot make myself create a separate .h file
-   for these three (sof.) 
-   
-*/
-extern void*   createAdjustor(int cconv, StgStablePtr hptr, StgFunPtr wptr);
-extern void    freeHaskellFunctionPtr(void* ptr);
-extern rtsBool initAdjustor(void);
+/* Initialising the whole adjustor thunk machinery. */
+extern void initAdjustor(void);
 
 extern void stg_exit(int n) GNU_ATTRIBUTE(__noreturn__);
 
@@ -202,14 +184,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
    -------------------------------------------------------------------------- */
@@ -245,30 +219,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; })