From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHx84-0007iv-OM for qemu-devel@nongnu.org; Wed, 22 Jul 2015 12:44:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZHx83-0004fE-KV for qemu-devel@nongnu.org; Wed, 22 Jul 2015 12:44:24 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34676) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHx83-0004ZT-DZ for qemu-devel@nongnu.org; Wed, 22 Jul 2015 12:44:23 -0400 From: Peter Maydell Date: Wed, 22 Jul 2015 17:44:03 +0100 Message-Id: <1437583451-9677-5-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1437583451-9677-1-git-send-email-peter.maydell@linaro.org> References: <1437583451-9677-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 04/12] compiler.h: Use glue() in QEMU_BUILD_BUG_ON define List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org Rather than rolling custom concatenate-strings macros for the QEMU_BUILD_BUG_ON macro to use, use the glue() macro we already have (since it's now available to us in this header). Signed-off-by: Peter Maydell --- include/qemu/compiler.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h index bdc9a60..d22eb01 100644 --- a/include/qemu/compiler.h +++ b/include/qemu/compiler.h @@ -89,10 +89,8 @@ #define inline always_inline #endif -#define cat(x,y) x ## y -#define cat2(x,y) cat(x,y) #define QEMU_BUILD_BUG_ON(x) \ - typedef char cat2(qemu_build_bug_on__,__LINE__)[(x)?-1:1] __attribute__((unused)); + typedef char glue(qemu_build_bug_on__,__LINE__)[(x)?-1:1] __attribute__((unused)); #if defined __GNUC__ # if !QEMU_GNUC_PREREQ(4, 4) -- 1.9.1