From 7e356a979459092d10450e66d8512381e89c2570 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ren=C3=A9=20Scharfe?= Date: Tue, 22 May 2012 22:36:39 +0200 Subject: [PATCH] xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Hide literals that can cause compiler warnings for 32-bit architectures in expressions that evaluate to small numbers there. Some compilers warn that 0x0001020304050608 won't fit into a 32-bit long, others that shifting right by 56 bits clears a 32-bit value completely. The correct values are calculated in the 64-bit case, which is all that matters in this if-branch. Reported-by: Øyvind A. Holm Signed-off-by: Rene Scharfe Acked-by: Thomas Rast Signed-off-by: Junio C Hamano --- xdiff/xutils.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xdiff/xutils.c b/xdiff/xutils.c index 277ccdff02..2021117799 100644 --- a/xdiff/xutils.c +++ b/xdiff/xutils.c @@ -301,7 +301,13 @@ static inline long count_masked_bytes(unsigned long mask) * that works for the bytemasks without having to * mask them first. */ - return mask * 0x0001020304050608 >> 56; + /* + * return mask * 0x0001020304050608 >> 56; + * + * Doing it like this avoids warnings on 32-bit machines. + */ + long a = (REPEAT_BYTE(0x01) / 0xff + 1); + return mask * a >> (sizeof(long) * 7); } else { /* * Modified Carl Chatfield G+ version for 32-bit * -- 2.11.4.GIT