From 7d5ef87f8c5ad2543448e34eb93db41dba39645d Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 15 Feb 2018 08:15:37 -0500 Subject: [PATCH] compiler.h: Use glue() in QEMU_BUILD_BUG_ON define 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). Backports commit 24134c4e9126bf505b612e901c63a102fc471083 from qemu --- qemu/include/qemu/compiler.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/qemu/include/qemu/compiler.h b/qemu/include/qemu/compiler.h index afd31256..e3ffdb64 100644 --- a/qemu/include/qemu/compiler.h +++ b/qemu/include/qemu/compiler.h @@ -154,10 +154,8 @@ static union MSVC_FLOAT_HACK __NAN = {{0x00, 0x00, 0xC0, 0x7F}}; #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)