From 0d8627d195965ff977a72bbd87d6fc4a74b7d7cc Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Fri, 10 Dec 2010 09:40:02 +0000 Subject: [PATCH] warning fix: don't redefine BLOCKS_PER_MBLOCK --- includes/rts/storage/Block.h | 2 ++ 1 file changed, 2 insertions(+) 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 */ -- 1.7.10.4