aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-07-21 19:50:44 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-07-21 19:55:49 +0100
commit4328608bc7f543bd89506396a4187a7c251fc7a6 (patch)
tree3903ddabf56b2d7dfcf8c8b430d7cf03820943fe
parent6f5f59868e605ad8ec8fa27c557169f37a029d92 (diff)
downloadqemu-arm-4328608bc7f543bd89506396a4187a7c251fc7a6.tar.gz
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). Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--include/qemu/compiler.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h
index bdc9a608a3..d22eb01be4 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)