From: Sami Kerola Date: Sat, 1 Oct 2011 11:58:51 +0000 (+0200) Subject: build-sys: rename BUILD_BUG_ON_ZERO definition X-Git-Tag: v2.21-rc1~351 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bfda68fdb11d4473684077392e42f7a81a0e5a75;p=thirdparty%2Futil-linux.git build-sys: rename BUILD_BUG_ON_ZERO definition Definition name is changed to UL_BUILD_BUG_ON_ZERO to avoid collision with a system header. ../include/c.h:72:1: warning: "BUILD_BUG_ON_ZERO" redefined In file included from /usr/include/sys/sysinfo.h:25, from dmesg.c:16: /usr/include/linux/kernel.h:34:1: warning: this is the location of the previous definition Signed-off-by: Sami Kerola --- diff --git a/include/c.h b/include/c.h index f5b4bcd44d..259e6b6cce 100644 --- a/include/c.h +++ b/include/c.h @@ -33,7 +33,7 @@ /* &a[0] degrades to a pointer: a different type from an array */ # define __must_be_array(a) \ - BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(__typeof__(a), __typeof__(&a[0]))) + UL_BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(__typeof__(a), __typeof__(&a[0]))) # define ignore_result(x) ({ \ __typeof__(x) __dummy __attribute__((__unused__)) = (x); (void) __dummy; \ @@ -69,7 +69,7 @@ * e.g. in a structure initializer (or where-ever else comma expressions * aren't permitted). */ -#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); })) +#define UL_BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); })) #define BUILD_BUG_ON_NULL(e) ((void *)sizeof(struct { int:-!!(e); })) #ifndef ARRAY_SIZE