X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStg.h;h=ff381730eb9ef6109ece84ddde49736735c3ab1b;hb=2b0a830e1a795b6049824f1371cf2ccaf710d045;hp=f863b55df3a04f249a7afecf3322d9749ba8b7c3;hpb=7457757f193b28b5fe8fee01edbed012c2fda897;p=ghc-hetmet.git

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index f863b55..ff38173 100644
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.47 2002/07/17 09:21:49 simonmar Exp $
+ * $Id: Stg.h,v 1.56 2003/09/21 13:22:01 igloo 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
@@ -31,6 +36,10 @@
 /* Configuration */
 #include "config.h"
 
+/* This needs to be up near the top as the register line on alpha needs
+ * to be before all procedures */
+#include "TailCalls.h"
+
 #if __GNUC__ >= 3
 /* Assume that a flexible array member at the end of a struct
  * can be defined thus: T arr[]; */
@@ -73,9 +82,6 @@
 #  define LAZY_BLACKHOLING
 #endif
 
-/* ToDo: remove */
-#define COMPILER 1
-
 /* TABLES_NEXT_TO_CODE says whether to assume that info tables are
  * assumed to reside just before the code for a function.
  *
@@ -165,6 +171,7 @@ typedef StgWord64       LW_;
 #include "StgLdvProf.h"
 
 /* Storage format definitions */
+#include "StgFun.h"
 #include "Closures.h"
 #include "ClosureTypes.h"
 #include "InfoTables.h"
@@ -180,12 +187,18 @@ typedef StgWord64       LW_;
 #include "SMP.h"
 #include "MachRegs.h"
 #include "Regs.h"
-#include "TailCalls.h"
 #include "Block.h"
 
 /* RTS public interface */
 #include "RtsAPI.h"
 
+/* System headers: stdlib.h is eeded so that we can use NULL.  It must
+ * come after MachRegs.h, because stdlib.h might define some inline
+ * functions which may only be defined after register variables have
+ * been declared.
+ */
+#include <stdlib.h>
+
 #ifdef SMP
 #include <pthread.h>
 #endif
@@ -212,14 +225,21 @@ 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;
+DLL_IMPORT_RTS extern char  *prog_name;
 
 extern void stackOverflow(void);
 
+#if defined(WANT_DOTNET_SUPPORT)
+#include "DNInvoke.h"
+#endif
+
 /* Creating and destroying an adjustor thunk.
    I cannot make myself create a separate .h file
    for these two (sof.)