X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStg.h;h=43ce31a74d27f0c1c2359f60345ec11cf6568ede;hb=f0f6913272d9475a6ac1b2a3cc59105c5756fba3;hp=8908cf3b154c91f6c37a916a05453743c8708619;hpb=ae2fa137637637d21e3ca46b25b9325a77e77641;p=ghc-hetmet.git diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h index 8908cf3..43ce31a 100644 --- a/ghc/includes/Stg.h +++ b/ghc/includes/Stg.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Stg.h,v 1.36 2001/03/01 12:25:32 rrt Exp $ + * $Id: Stg.h,v 1.49 2002/09/06 14:34:14 simonmar 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 @@ -38,6 +36,19 @@ /* Configuration */ #include "config.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" @@ -75,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 @@ -101,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 -------------------------------------------------------------------------- */ @@ -148,6 +167,7 @@ typedef StgWord64 LW_; /* Profiling information */ #include "StgProf.h" +#include "StgLdvProf.h" /* Storage format definitions */ #include "Closures.h" @@ -171,22 +191,6 @@ typedef StgWord64 LW_; /* RTS public interface */ #include "RtsAPI.h" -/* these are all ANSI C headers */ -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_SIGNAL_H -#include -#endif - -#ifdef HAVE_UNISTD_H -#include -#endif - #ifdef SMP #include #endif @@ -213,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.