From 94ae2a75fbc73d6e017f0a9e49560ab809f56eb4 Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Wed, 2 May 2007 10:42:48 +0000 Subject: [PATCH] Merge r1759 (keep gcc-4.2 happy) git-svn-id: svn://svn.valgrind.org/vex/branches/VEX_3_2_BRANCH@1760 --- VEX/pub/libvex_basictypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VEX/pub/libvex_basictypes.h b/VEX/pub/libvex_basictypes.h index fd5284a364..8ec77ed68f 100644 --- 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 -- 2.47.2