X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStg.h;h=43ce31a74d27f0c1c2359f60345ec11cf6568ede;hb=6ddd83ed3708374cdc06a6eafbb5714b5b8934b4;hp=94062757f316d9ca1398ddd5fa039f0551ab1316;hpb=aa84d93a9a3a3ff9b606ce24b6c73f5f06ff2c0a;p=ghc-hetmet.git

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index 9406275..43ce31a 100644
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.38 2001/08/29 17:24:25 qrczak Exp $
+ * $Id: Stg.h,v 1.49 2002/09/06 14:34:14 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
 
@@ -103,6 +112,14 @@ void _stgAssert (char *, unsigned int);
 	    _stgAssert(__FILE__, __LINE__)
 #endif /* DEBUG */
 
+/* 
+ * Use this on the RHS of macros which expand to nothing
+ * to make sure that the macro can be used in a context which
+ * demands a non-empty statement.
+ */
+
+#define doNothing() do { } while (0)
+
 /* -----------------------------------------------------------------------------
    Global type definitions
    -------------------------------------------------------------------------- */
@@ -150,6 +167,7 @@ typedef StgWord64       LW_;
 
 /* Profiling information */
 #include "StgProf.h"
+#include "StgLdvProf.h"
 
 /* Storage format definitions */
 #include "Closures.h"
@@ -173,22 +191,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
@@ -215,14 +217,14 @@ typedef StgWord64       LW_;
 /* Runtime-system hooks */
 #include "Hooks.h"
 
+#include "Signals.h"
+
 #include "HsFFI.h"
 
 /* Misc stuff without a home */
 DLL_IMPORT_RTS extern char **prog_argv;	/* so we can get at these from Haskell */
 DLL_IMPORT_RTS extern int    prog_argc;
 
-extern char **environ;
-
 extern void stackOverflow(void);
 
 /* Creating and destroying an adjustor thunk.