Change the representation of the MVar blocked queue

[ghc-hetmet.git] / includes / rts / storage / Block.h

diff --git a/includes/rts/storage/Block.h b/includes/rts/storage/Block.h
index e99a03e..d6a4d4c 100644 (file)
--- a/includes/rts/storage/Block.h
+++ b/includes/rts/storage/Block.h
@@ -57,8 +57,8 @@ typedef struct bdescr_ {
         StgPtr  scan;           /* scan pointer for copying GC */
     } u;
 
-    struct step_ *step;                /* step */
-    struct step_ *dest;                /* destination step */
+    struct generation_ *gen;   /* generation */
+    struct generation_ *dest;  /* destination gen */
 
     StgWord32 blocks;          /* no. of blocks (if grp head, 0 otherwise) */
 
@@ -109,7 +109,8 @@ typedef struct bdescr_ {
 
 #else
 
-INLINE_HEADER bdescr *Bdescr(StgPtr p)
+EXTERN_INLINE bdescr *Bdescr(StgPtr p);
+EXTERN_INLINE bdescr *Bdescr(StgPtr p)
 {
   return (bdescr *)
     ((((W_)p &  MBLOCK_MASK & ~BLOCK_MASK) >> (BLOCK_SHIFT-BDESCR_SHIFT))