From e74f3b0234de9a8e0596166bdfa04af3f031249c Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Tue, 11 Feb 2014 18:02:06 +0100 Subject: add parens when bit and arith ops are mixed in macros in public headers another commit to silence gcc warnings (-Wparentheses) for standard headers. changed macros: LOG_UPTO, IN6_ARE_ADDR_EQUAL --- include/netinet/in.h | 2 +- include/syslog.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/netinet/in.h b/include/netinet/in.h index 587ef358..2e25afeb 100644 --- a/include/netinet/in.h +++ b/include/netinet/in.h @@ -149,7 +149,7 @@ uint16_t ntohs(uint16_t); (IN6_IS_ADDR_MULTICAST(a) && ((((uint8_t *) (a))[1] & 0xf) == 0xe)) #define __ARE_4_EQUAL(a,b) \ - (!( 0[a]-0[b] | 1[a]-1[b] | 2[a]-2[b] | 3[a]-3[b] )) + (!( (0[a]-0[b]) | (1[a]-1[b]) | (2[a]-2[b]) | (3[a]-3[b]) )) #define IN6_ARE_ADDR_EQUAL(a,b) \ __ARE_4_EQUAL((const uint32_t *)(a), (const uint32_t *)(b)) diff --git a/include/syslog.h b/include/syslog.h index f7f545f7..71dbd99b 100644 --- a/include/syslog.h +++ b/include/syslog.h @@ -21,7 +21,7 @@ extern "C" { #define LOG_MAKEPRI(f, p) (((f)<<3)|(p)) #define LOG_MASK(p) (1<<(p)) -#define LOG_UPTO(p) ((1<<(p)+1)-1) +#define LOG_UPTO(p) ((1<<((p)+1))-1) #define LOG_KERN (0<<3) #define LOG_USER (1<<3) -- cgit v1.2.1