aboutsummaryrefslogtreecommitdiff
path: root/include/qemu/compiler.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-08-19 16:20:19 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-08-19 16:29:53 +0100
commit24134c4e9126bf505b612e901c63a102fc471083 (patch)
treeaa6abcac5c1a79cc37ffc8956dfac6abe66d87c8 /include/qemu/compiler.h
parent4912086865083a008f4fb73173fd0ddf2206c4d9 (diff)
downloadqemu-24134c4e9126bf505b612e901c63a102fc471083.zip
qemu-24134c4e9126bf505b612e901c63a102fc471083.tar.gz
qemu-24134c4e9126bf505b612e901c63a102fc471083.tar.bz2
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> Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'include/qemu/compiler.h')
-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 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)