Sudden attack of 64-bit paranoia: therefore stick even more (probably

pointless) casts in.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3688

diff --git a/include/tool.h b/include/tool.h
index 17634f98b7cdb33564891e574aad9c1aea7965fc..5f81193d319f612b9991d06f4c822262a1788b77 100644 (file)
--- a/include/tool.h
+++ b/include/tool.h
@@ -210,11 +210,11 @@ extern void VG_(popcc)  ( UInt cc );
 /* General stuff */
 
 /* Check if an address/whatever is aligned */
-#define VG_IS_4_ALIGNED(aaa_p)      (0 == (((Addr)(aaa_p)) & 0x3))
-#define VG_IS_8_ALIGNED(aaa_p)      (0 == (((Addr)(aaa_p)) & 0x7))
-#define VG_IS_16_ALIGNED(aaa_p)     (0 == (((Addr)(aaa_p)) & 0xf))
-#define VG_IS_WORD_ALIGNED(aaa_p)   (0 == (((Addr)(aaa_p)) & (sizeof(Addr)-1)))
-#define VG_IS_PAGE_ALIGNED(aaa_p)   (0 == (((Addr)(aaa_p)) & (VKI_PAGE_SIZE-1)))
+#define VG_IS_4_ALIGNED(aaa_p)    (0 == (((Addr)(aaa_p)) & ((Addr)0x3)))
+#define VG_IS_8_ALIGNED(aaa_p)    (0 == (((Addr)(aaa_p)) & ((Addr)0x7)))
+#define VG_IS_16_ALIGNED(aaa_p)   (0 == (((Addr)(aaa_p)) & ((Addr)0xf)))
+#define VG_IS_WORD_ALIGNED(aaa_p) (0 == (((Addr)(aaa_p)) & ((Addr)(sizeof(Addr)-1))))
+#define VG_IS_PAGE_ALIGNED(aaa_p) (0 == (((Addr)(aaa_p)) & ((Addr)(VKI_PAGE_SIZE-1))))
 
 
 /* ------------------------------------------------------------------ */