X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStg.h;h=05ae7d10abbb893c00f739de7a3534e2a28409cc;hb=ebeb534bad20646923b4f59085f9cf22ba93fb46;hp=a877e2f16240526fdfb129806d7c54428bc155c8;hpb=d34cca401fa00c7ebbf2085bf5490baf4fa5c0d3;p=ghc-hetmet.git diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h index a877e2f..05ae7d1 100644 --- a/ghc/includes/Stg.h +++ b/ghc/includes/Stg.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Stg.h,v 1.51 2003/05/23 08:28:48 simonmar Exp $ + * $Id: Stg.h,v 1.55 2003/08/22 22:24:16 sof Exp $ * * (c) The GHC Team, 1998-1999 * @@ -189,6 +189,13 @@ typedef StgWord64 LW_; /* 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 + #ifdef SMP #include #endif @@ -222,9 +229,14 @@ typedef StgWord64 LW_; /* 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.)