From dcf58a64367700d80dc7609b1b55ff6a8e8b97ee Mon Sep 17 00:00:00 2001
From: simonmar <unknown>
Date: Mon, 6 Sep 2004 14:15:38 +0000
Subject: [PATCH] [project @ 2004-09-06 14:15:38 by simonmar] some cleanups

---
 ghc/includes/Rts.h |   24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

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; })
-- 
1.7.10.4