[project @ 2004-04-05 10:53:52 by simonpj]

[ghc-hetmet.git] / ghc / includes / Stg.h

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index a3eda0f..dd41d37 100644 (file)
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.57 2003/11/12 17:27:04 sof Exp $
+ * $Id: Stg.h,v 1.62 2004/03/23 10:03:18 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -88,6 +88,12 @@
 #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
@@ -105,7 +111,7 @@
 /*
  * 'Portable' 
  */
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined( __INTEL_COMPILER)
 # define INLINE_HEADER static inline
 # define INLINE_ME inline
 # define STATIC_INLINE INLINE_HEADER
@@ -275,12 +281,13 @@ extern void stackOverflow(void);
 #include "DNInvoke.h"
 #endif
 
-/* Creating and destroying an adjustor thunk.
-   I cannot make myself create a separate .h file
-   for these two (sof.) 
+/* 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 void*   createAdjustor(int cconv, StgStablePtr hptr, StgFunPtr wptr);
+extern void    freeHaskellFunctionPtr(void* ptr);
+extern rtsBool initAdjustor(void);
 
 #endif /* STG_H */