X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStg.h;h=17568b594f6860a95892f7e4e20db11709bf6094;hb=a7d8f43718b167689c0a4a4c23b33a325e0239f1;hp=4c891b7fc86be34bc98df2216cdeae6ef1d10532;hpb=9ac55e08e159d7a4647ab01e7872e69dd762f275;p=ghc-hetmet.git

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index 4c891b7..17568b5 100644
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.34 2000/12/04 12:31:20 simonmar Exp $
+ * $Id: Stg.h,v 1.52 2003/05/29 14:39:30 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -7,18 +7,16 @@
  *
  * 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
 #define STG_H
 
-#ifndef NON_POSIX_SOURCE
-#define _POSIX_SOURCE   1
-#define _POSIX_C_SOURCE 199309L
-#define _ISOC9X_SOURCE
-#endif
-
-/* Let's be ISO C9X too... */
 
 /* If we include "Stg.h" directly, we're in STG code, and we therefore
  * get all the global register variables, macros etc. that go along
@@ -37,13 +35,28 @@
 
 /* Configuration */
 #include "config.h"
-#ifdef __HUGS__ /* vile hack till the GHC folks come on board */
-#include "options.h"
+
+#if __GNUC__ >= 3
+/* Assume that a flexible array member at the end of a struct
+ * can be defined thus: T arr[]; */
+#define FLEXIBLE_ARRAY
+#else
+/* Assume that it must be defined thus: T arr[0]; */
+#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"
 
+/* Fix for mingw stat problem (done here so it's early enough) */
+#ifdef mingw32_TARGET_OS
+#define __MSVCRT__ 1
+#endif
+
 /* Turn lazy blackholing and eager blackholing on/off.
  *
  * Using eager blackholing makes things easier to debug because
@@ -65,17 +78,12 @@
 #  define LAZY_BLACKHOLING
 #endif
 
-/* ToDo: Set this flag properly: COMPILER and INTERPRETER should not be mutually exclusive. */
-#ifndef INTERPRETER
-#define COMPILER 1
-#endif
-
 /* TABLES_NEXT_TO_CODE says whether to assume that info tables are
  * assumed to reside just before the code for a function.
  *
  * 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
 
@@ -101,6 +109,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
    -------------------------------------------------------------------------- */
@@ -148,8 +164,10 @@ typedef StgWord64       LW_;
 
 /* Profiling information */
 #include "StgProf.h"
+#include "StgLdvProf.h"
 
 /* Storage format definitions */
+#include "StgFun.h"
 #include "Closures.h"
 #include "ClosureTypes.h"
 #include "InfoTables.h"
@@ -171,22 +189,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
@@ -213,16 +215,20 @@ 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);
 
+#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.)