From: Heiko Schocher <hs@denx.de>
Date: Wed, 8 Jun 2011 23:07:05 +0000 (+0000)
Subject: common: move BUILD_BUG_ON define to common.h
X-Git-Tag: v2011.09-rc1~135
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c00e17c7fe184c966e34ad48bf753c930ebac1df;p=u-boot

common: move BUILD_BUG_ON define to common.h

see discussion also here:
http://patchwork.ozlabs.org/patch/75309/

Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
cc: Holger Brunck <holger.brunck@keymile.com>
---

diff --git a/include/common.h b/include/common.h
index 6061643873..157279122b 100644
--- a/include/common.h
+++ b/include/common.h
@@ -137,6 +137,9 @@ typedef volatile unsigned char	vu_char;
 #define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
 #endif /* BUG */
 
+/* Force a compilation error if condition is true */
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
+
 typedef void (interrupt_handler_t)(void *);
 
 #include <asm/u-boot.h> /* boot information for Linux kernel */
diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h
index d2c90a6b44..69006e250a 100644
--- a/include/ubi_uboot.h
+++ b/include/ubi_uboot.h
@@ -191,9 +191,6 @@ static inline long IS_ERR(const void *ptr)
 	return IS_ERR_VALUE((unsigned long)ptr);
 }
 
-/* Force a compilation error if condition is true */
-#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
-
 /* module */
 #define THIS_MODULE		0
 #define try_module_get(...)	1