X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMBlock.h;h=b44f6ddd1d2d632b69a8708136a862a9b79fbcb7;hb=b4639cb249f2f904eb78271d0bdedbd90ceb7216;hp=f5283541f6c63fea4d1b11ffc497e88c52822ae8;hpb=7dc97354e24071c4ece647b918cd5eb1d0cd85ed;p=ghc-hetmet.git

diff --git a/ghc/rts/MBlock.h b/ghc/rts/MBlock.h
index f528354..b44f6dd 100644
--- a/ghc/rts/MBlock.h
+++ b/ghc/rts/MBlock.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: MBlock.h,v 1.18 2003/08/29 16:00:29 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -9,7 +8,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 +70,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