From 2a0d2a8e11adfde412a8b70c4fdafa607e84c670 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sun, 28 Sep 2014 20:51:43 +0100 Subject: include: fix compiler warnings This change has motivation to make -Wall -pedantic compiler options to spit a little bit less noise, which with luck will increase change to notice real issues. Multiple of these: warning: ISO C forbids braced-groups within expressions [-Wpedantic] And nearly 300 times reported: include/c.h:75:41: warning: struct has no named members [-Wpedantic] #define UL_BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); })) Signed-off-by: Sami Kerola --- include/c.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include/c.h') diff --git a/include/c.h b/include/c.h index e423e8b30..0f6e5b29b 100644 --- a/include/c.h +++ b/include/c.h @@ -37,7 +37,7 @@ # define __must_be_array(a) \ UL_BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(__typeof__(a), __typeof__(&a[0]))) -# define ignore_result(x) ({ \ +# define ignore_result(x) __extension__ ({ \ __typeof__(x) __dummy __attribute__((__unused__)) = (x); (void) __dummy; \ }) @@ -72,7 +72,7 @@ * e.g. in a structure initializer (or wherever else comma expressions * aren't permitted). */ -#define UL_BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); })) +#define UL_BUILD_BUG_ON_ZERO(e) __extension__ (sizeof(struct { int:-!!(e); })) #define BUILD_BUG_ON_NULL(e) ((void *)sizeof(struct { int:-!!(e); })) #ifndef ARRAY_SIZE @@ -92,7 +92,7 @@ #endif #ifndef min -# define min(x, y) ({ \ +# define min(x, y) __extension__ ({ \ __typeof__(x) _min1 = (x); \ __typeof__(y) _min2 = (y); \ (void) (&_min1 == &_min2); \ @@ -100,7 +100,7 @@ #endif #ifndef max -# define max(x, y) ({ \ +# define max(x, y) __extension__ ({ \ __typeof__(x) _max1 = (x); \ __typeof__(y) _max2 = (y); \ (void) (&_max1 == &_max2); \ @@ -112,7 +112,7 @@ #endif #ifndef container_of -#define container_of(ptr, type, member) ({ \ +#define container_of(ptr, type, member) __extension__ ({ \ const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) #endif -- cgit v1.2.3-55-g7522