[project @ 2000-04-03 15:54:49 by simonmar]

[ghc-hetmet.git] / ghc / includes / Stg.h

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index c8d729d..7a2266c 100644 (file)
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.21 1999/11/09 15:57:40 simonmar Exp $
+ * $Id: Stg.h,v 1.25 2000/04/03 15:54:49 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -103,12 +103,13 @@ void _stgAssert (char *, unsigned int);
 
 /* Global type definitions*/
 #include "StgTypes.h"
+#include "RtsTypes.h"
 
 /* Global constaints */
 #include "Constants.h"
 
 /* Profiling information */
-#include "Profiling.h"
+#include "StgProf.h"
 
 /* Storage format definitions */
 #include "Closures.h"
@@ -116,6 +117,12 @@ void _stgAssert (char *, unsigned int);
 #include "InfoTables.h"
 #include "TSO.h"
 
+/* Simulated-parallel information */
+#include "GranSim.h"
+
+/* Parallel information */
+#include "Parallel.h"
+
 /* STG/Optimised-C related stuff */
 #include "SMP.h"
 #include "MachRegs.h"
@@ -149,9 +156,6 @@ void _stgAssert (char *, unsigned int);
 /* GNU mp library */
 #include "gmp.h"
 
-/* Wired-in Prelude identifiers */
-#include "Prelude.h"
-
 /* Storage Manager */
 #include "StgStorage.h"
 
@@ -159,7 +163,6 @@ void _stgAssert (char *, unsigned int);
 #include "ClosureMacros.h"
 #include "InfoMacros.h"
 #include "StgMacros.h"
-#include "StgProf.h"
 #include "PrimOps.h"
 #include "Updates.h"
 #include "StgTicky.h"
@@ -173,13 +176,8 @@ void _stgAssert (char *, unsigned int);
 #include "Hooks.h"
 
 /* Misc stuff without a home */
-#if defined(ENABLE_WIN32_DLL_SUPPOT) && !defined(COMPILING_RTS)
-extern DLLIMPORT char **prog_argv;     /* so we can get at these from Haskell */
-extern DLLIMPORT int    prog_argc;
-#else
-extern char **prog_argv;       /* so we can get at these from Haskell */
-extern int    prog_argc;
-#endif
+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;