[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit f2e5aaafbb5eeed6dfaf25cd11c74eac315e210f
Author: aCaB <acab at clamav.net>
Date:   Fri Jan 22 12:51:54 2010 +0100

    make distcheck happy

diff --git a/libclamav/others.h b/libclamav/others.h
index 18c2ac9..0e54d3a 100644
--- a/libclamav/others.h
+++ b/libclamav/others.h
@@ -382,8 +382,8 @@ static inline void cli_writeint32(char *offset, uint32_t value)
 /* used by: spin, yc (C) aCaB */
 #define __SHIFTBITS(a) (sizeof(a)<<3)
 #define __SHIFTMASK(a) (__SHIFTBITS(a)-1)
-#define CLI_ROL(a,b) a = ( a << (b & __SHIFTMASK(a)) ) | ( a >> ((__SHIFTBITS(a) - b) & __SHIFTMASK(a)) )
-#define CLI_ROR(a,b) a = ( a >> (b & __SHIFTMASK(a)) ) | ( a << ((__SHIFTBITS(a) - b) & __SHIFTMASK(a)) )
+#define CLI_ROL(a,b) a = ( a << ((b) & __SHIFTMASK(a)) ) | ( a >> ((__SHIFTBITS(a) - (b)) & __SHIFTMASK(a)) )
+#define CLI_ROR(a,b) a = ( a >> ((b) & __SHIFTMASK(a)) ) | ( a << ((__SHIFTBITS(a) - (b)) & __SHIFTMASK(a)) )
 
 /* Implementation independent sign-extended signed right shift */
 #ifdef HAVE_SAR

-- 
Debian repository for ClamAV