summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2012-11-13 15:58:17 +0000
committerIan Lynagh <ian@well-typed.com>2012-11-13 15:58:17 +0000
commit4aa921e72d716ddeeb3ddf8d833996980395a77e (patch)
treed52a4d4b41c8037fcc1b6b48282c2f384d913a51 /includes
parente86dee338e1f92250332fbf63a12671b533dab79 (diff)
downloadhaskell-4aa921e72d716ddeeb3ddf8d833996980395a77e.tar.gz
Don't include a (void *) cast in BLOCK_ROUND_UP
All uses of it cast the result anyway. However, DeriveConstants needs it to not include the cast, as (void *) casts can't be used in constant expressions.
Diffstat (limited to 'includes')
-rw-r--r--includes/rts/storage/Block.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/rts/storage/Block.h b/includes/rts/storage/Block.h
index 0a9b12b874..008602af3d 100644
--- a/includes/rts/storage/Block.h
+++ b/includes/rts/storage/Block.h
@@ -19,7 +19,7 @@
#define BLOCK_SIZE_W (BLOCK_SIZE/sizeof(W_))
#define BLOCK_MASK (BLOCK_SIZE-1)
-#define BLOCK_ROUND_UP(p) ((void *) (((W_)(p)+BLOCK_SIZE-1) & ~BLOCK_MASK))
+#define BLOCK_ROUND_UP(p) (((W_)(p)+BLOCK_SIZE-1) & ~BLOCK_MASK)
#define BLOCK_ROUND_DOWN(p) ((void *) ((W_)(p) & ~BLOCK_MASK))
/* Megablock related constants (MBLOCK_SHIFT is defined in Constants.h) */