X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FRts.h;h=4a60688e61390b69210f449555ba8c8b8f842f52;hb=dcf58a64367700d80dc7609b1b55ff6a8e8b97ee;hp=c7531ff8c3c5e4c3cdd3f954eb97af5f31e762db;hpb=1d10874717ff05d2babc9cbf079d5895fcc0a922;p=ghc-hetmet.git

diff --git a/ghc/includes/Rts.h b/ghc/includes/Rts.h
index c7531ff..4a60688 100644
--- a/ghc/includes/Rts.h
+++ b/ghc/includes/Rts.h
@@ -1,7 +1,6 @@
 /* -----------------------------------------------------------------------------
- * $Id: Rts.h,v 1.27 2004/09/06 11:10:34 simonmar Exp $
  *
- * (c) The GHC Team, 1998-1999
+ * (c) The GHC Team, 1998-2004
  *
  * Top-level include file for the RTS itself
  *
@@ -51,6 +50,8 @@ extern "C" {
 #define GNUC3_ATTRIBUTE(at)
 #endif
 
+#define STG_UNUSED    GNUC3_ATTRIBUTE(__unused__)
+
 /* 
  * Empty structures isn't supported by all, so to define
  * empty structures, please protect the defn with an
@@ -240,30 +241,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; })