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 <peter.mayd...@linaro.org> --- 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
