From: simonmar <unknown>
Date: Mon, 6 Sep 2004 11:00:21 +0000 (+0000)
Subject: [project @ 2004-09-06 11:00:21 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~1635
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=770cf0549a25ab66546a2d20a56c8f38c569d5d7

[project @ 2004-09-06 11:00:21 by simonmar]
eliminate some more gcc 3.4 warnings
---

diff --git a/ghc/rts/BlockAlloc.c b/ghc/rts/BlockAlloc.c
index 034b621..931e02c 100644
--- a/ghc/rts/BlockAlloc.c
+++ b/ghc/rts/BlockAlloc.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: BlockAlloc.c,v 1.18 2004/09/03 15:28:19 simonmar Exp $
+ * $Id: BlockAlloc.c,v 1.19 2004/09/06 11:00:21 simonmar Exp $
  *
  * (c) The GHC Team 1998-2000
  * 
@@ -262,12 +262,13 @@ static void
 freeMegaGroup(bdescr *p)
 {
   nat n;
+  void *q = p;
 
-  n = p->blocks * BLOCK_SIZE / MBLOCK_SIZE + 1;
-  for (; n > 0; (W_)p += MBLOCK_SIZE, n--) {
-    initMBlock(MBLOCK_ROUND_DOWN(p));
-    initGroup(BLOCKS_PER_MBLOCK, p);
-    freeGroup(p);
+  n = ((bdescr *)q)->blocks * BLOCK_SIZE / MBLOCK_SIZE + 1;
+  for (; n > 0; q += MBLOCK_SIZE, n--) {
+    initMBlock(MBLOCK_ROUND_DOWN(q));
+    initGroup(BLOCKS_PER_MBLOCK, (bdescr *)q);
+    freeGroup((bdescr *)q);
   }
 }
 
@@ -296,7 +297,7 @@ initMBlock(void *mblock)
 
   /* Initialise the start field of each block descriptor
    */
-  for (; block <= LAST_BLOCK(mblock); bd += 1, (lnat)block += BLOCK_SIZE) {
+  for (; block <= LAST_BLOCK(mblock); bd += 1, block += BLOCK_SIZE) {
     bd->start = block;
   }
 }