X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FStg.h;h=636bb1e227a8f9521e3f21b7f10e62a6b0f414a0;hb=786db5767c7db0af9c4770d5a73c94606d4bdced;hp=94062757f316d9ca1398ddd5fa039f0551ab1316;hpb=aa84d93a9a3a3ff9b606ce24b6c73f5f06ff2c0a;p=ghc-hetmet.git

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index 9406275..636bb1e 100644
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.38 2001/08/29 17:24:25 qrczak Exp $
+ * $Id: Stg.h,v 1.45 2002/02/13 07:48:19 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -40,6 +40,10 @@
 #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"
 
@@ -103,6 +107,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
    -------------------------------------------------------------------------- */
@@ -150,6 +162,7 @@ typedef StgWord64       LW_;
 
 /* Profiling information */
 #include "StgProf.h"
+#include "StgLdvProf.h"
 
 /* Storage format definitions */
 #include "Closures.h"
@@ -221,8 +234,6 @@ typedef StgWord64       LW_;
 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.