diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-08-19 16:20:19 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-08-19 16:29:53 +0100 |
| commit | 24134c4e9126bf505b612e901c63a102fc471083 (patch) | |
| tree | aa6abcac5c1a79cc37ffc8956dfac6abe66d87c8 | |
| parent | 4912086865083a008f4fb73173fd0ddf2206c4d9 (diff) | |
| download | qemu-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>
| -rw-r--r-- | include/qemu/compiler.h | 4 |
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) |