X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fincludes%2FStg.h;h=b515e21f0be12a5ac8a28c93ce19fcf181e2d23d;hb=931f16bbdcf82221a29fe404af604b9372dc60c4;hp=f2140ca1065ca0cba090132117ba5644b9aba5c4;hpb=d11e681f219f6e38c2e5bc87adfb66f82de5ea65;p=ghc-hetmet.git

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index f2140ca..b515e21 100644
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.43 2001/12/05 17:35:14 sewardj Exp $
+ * $Id: Stg.h,v 1.50 2002/12/11 15:36:39 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -7,6 +7,11 @@
  *
  * This file is included *automatically* by all .hc files.
  *
+ * NOTE: always include Stg.h *before* any other headers, because we
+ * define some register variables which must be done before any inline
+ * functions are defined (some system headers have been known to
+ * define the odd inline function).
+ *
  * ---------------------------------------------------------------------------*/
 
 #ifndef STG_H
@@ -40,6 +45,10 @@
 #define FLEXIBLE_ARRAY 0
 #endif
 
+#if defined(SMP) || defined(THREADED_RTS)
+#define RTS_SUPPORTS_THREADS 1
+#endif
+
 /* Some macros to handle DLLing (Win32 only at the moment). */
 #include "StgDLL.h"
 
@@ -77,7 +86,7 @@
  *
  * UNDEFINING THIS WON'T WORK ON ITS OWN.  You have been warned.
  */
-#ifndef USE_MINIINTERPRETER
+#if !defined(USE_MINIINTERPRETER) && !defined(ia64_TARGET_ARCH)
 #define TABLES_NEXT_TO_CODE
 #endif
 
@@ -161,6 +170,7 @@ typedef StgWord64       LW_;
 #include "StgLdvProf.h"
 
 /* Storage format definitions */
+#include "StgFun.h"
 #include "Closures.h"
 #include "ClosureTypes.h"
 #include "InfoTables.h"
@@ -182,22 +192,6 @@ typedef StgWord64       LW_;
 /* RTS public interface */
 #include "RtsAPI.h"
 
-/* these are all ANSI C headers */
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-
-#ifdef HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef SMP
 #include <pthread.h>
 #endif
@@ -217,7 +211,6 @@ typedef StgWord64       LW_;
 #include "StgTicky.h"
 #include "CCall.h"
 #include "Stable.h"
-#include "PrimOpHelpers.h"
 
 /* Built-in entry points */
 #include "StgMiscClosures.h"
@@ -225,6 +218,8 @@ typedef StgWord64       LW_;
 /* Runtime-system hooks */
 #include "Hooks.h"
 
+#include "Signals.h"
+
 #include "HsFFI.h"
 
 /* Misc stuff without a home */