From: Simon Marlow <marlowsd@gmail.com>
Date: Fri, 10 Dec 2010 09:40:02 +0000 (+0000)
Subject: warning fix: don't redefine BLOCKS_PER_MBLOCK
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=0d8627d195965ff977a72bbd87d6fc4a74b7d7cc

warning fix: don't redefine BLOCKS_PER_MBLOCK
---

diff --git a/includes/rts/storage/Block.h b/includes/rts/storage/Block.h
index 4fb5a96..f39b99c 100644
--- a/includes/rts/storage/Block.h
+++ b/includes/rts/storage/Block.h
@@ -149,7 +149,9 @@ EXTERN_INLINE bdescr *Bdescr(StgPtr p)
 
 /* Number of usable blocks in a megablock */
 
+#ifndef CMINUSMINUS // already defined in DerivedConstants.h
 #define BLOCKS_PER_MBLOCK ((MBLOCK_SIZE - FIRST_BLOCK_OFF) / BLOCK_SIZE)
+#endif
 
 /* How many blocks in this megablock group */