Merge r1759 (keep gcc-4.2 happy)

git-svn-id: svn://svn.valgrind.org/vex/branches/VEX_3_2_BRANCH@1760

diff --git a/VEX/pub/libvex_basictypes.h b/VEX/pub/libvex_basictypes.h
index fd5284a364ab7765b842b58d7db18334ad604216..8ec77ed68fbcb524c02461f76b496147e9b71ae9 100644 (file)
--- a/VEX/pub/libvex_basictypes.h
+++ b/VEX/pub/libvex_basictypes.h
@@ -123,7 +123,7 @@ typedef  unsigned long HWord;
 
 /* This is so useful it should be visible absolutely everywhere. */
 #if !defined(offsetof)
-#   define offsetof(type,memb) ((Int)&((type*)0)->memb)
+#   define offsetof(type,memb) ((Int)(HWord)&((type*)0)->memb)
 #endif