[project @ 2004-08-13 13:04:50 by simonmar]

[ghc-hetmet.git] / ghc / rts / MBlock.h

diff --git a/ghc/rts/MBlock.h b/ghc/rts/MBlock.h
index f528354..64fd459 100644 (file)
--- a/ghc/rts/MBlock.h
+++ b/ghc/rts/MBlock.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: MBlock.h,v 1.18 2003/08/29 16:00:29 simonmar Exp $
+ * $Id: MBlock.h,v 1.20 2004/08/13 13:10:10 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -9,7 +9,8 @@
 
 #ifndef __MBLOCK_H__
 #define __MBLOCK_H__
-extern lnat mblocks_allocated;
+
+extern lnat RTS_VAR(mblocks_allocated);
 
 extern void * getMBlock(void);
 extern void * getMBlocks(nat n);
@@ -70,7 +71,7 @@ extern StgWord8 mblock_map[];
 # define MARK_HEAP_ALLOCED(p)  ((MBLOCK_MAP_ENTRY(p) < MBLOCK_MAP_SIZE) \
                                        && (mblock_map[MBLOCK_MAP_ENTRY(p)] = 1))
 
-#elif defined(x86_64_TARGET_ARCH)
+#elif SIZEOF_VOID_P == 8
 /* XXX: This is a HACK, and will not work in general!  We just use the
  * lower 32 bits of the address, and do the same as for the 32-bit
  * version.  As long as the OS gives us memory in a roughly linear