[project @ 1999-11-02 15:05:38 by simonmar]

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

diff --git a/ghc/includes/StgStorage.h b/ghc/includes/StgStorage.h
index 6b1237e..6c9b0d3 100644 (file)
--- a/ghc/includes/StgStorage.h
+++ b/ghc/includes/StgStorage.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgStorage.h,v 1.4 1999/03/02 19:44:21 sof Exp $
+ * $Id: StgStorage.h,v 1.5 1999/11/02 15:05:53 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -10,10 +10,6 @@
 #ifndef STGSTORAGE_H
 #define STGSTORAGE_H
 
-#include "Block.h"
-
-extern DLL_IMPORT_RTS bdescr *current_nursery;
-
 /* -----------------------------------------------------------------------------
    Allocation area for compiled code
 
@@ -29,10 +25,10 @@ extern DLL_IMPORT_RTS bdescr *current_nursery;
    -------------------------------------------------------------------------- */
 
 #define OpenNursery(hp,hplim)                          \
-  (hp    = current_nursery->free-1,                    \
-   hplim = current_nursery->start + BLOCK_SIZE_W - 1)
+  (hp    = CurrentNursery->free-1,                     \
+   hplim = CurrentNursery->start + BLOCK_SIZE_W - 1)
   
-#define CloseNursery(hp)  (current_nursery->free = (P_)(hp)+1)
+#define CloseNursery(hp)  (CurrentNursery->free = (P_)(hp)+1)
 
 /* -----------------------------------------------------------------------------
    Trigger a GC from Haskell land.