diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2010-12-10 09:40:02 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2010-12-10 09:40:02 +0000 |
| commit | 0d8627d195965ff977a72bbd87d6fc4a74b7d7cc (patch) | |
| tree | 53e33967f63371d50d321148bdf4c359d29a4490 /includes | |
| parent | 00a4cdf7db3ac722db2346416a1b3b891dbc9a0a (diff) | |
| download | haskell-0d8627d195965ff977a72bbd87d6fc4a74b7d7cc.tar.gz | |
warning fix: don't redefine BLOCKS_PER_MBLOCK
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/rts/storage/Block.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/includes/rts/storage/Block.h b/includes/rts/storage/Block.h index 4fb5a96c54..f39b99c0dc 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 */ |