[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/12] compiler.h: Use glue() in QEMU_BUILD_BUG_ON d
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 04/12] compiler.h: Use glue() in QEMU_BUILD_BUG_ON define |
Date: |
Wed, 22 Jul 2015 17:44:03 +0100 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH 00/12] qemu-common.h/osdep.h refactoring, Peter Maydell, 2015/07/22
- [Qemu-devel] [PATCH 12/12] throttle.h: Don't include qemu-common.h, Peter Maydell, 2015/07/22
- [Qemu-devel] [PATCH 11/12] event_notifier.h: Don't include qemu-common.h, Peter Maydell, 2015/07/22
- [Qemu-devel] [PATCH 10/12] timer.h: Don't include qemu-common.h, Peter Maydell, 2015/07/22
- [Qemu-devel] [PATCH 01/12] qapi/qmp-event.c: Don't manually include os-win32.h/os-posix.h, Peter Maydell, 2015/07/22
- [Qemu-devel] [PATCH 06/12] osdep.h: Move some OS header includes and fixups from qemu-common.h, Peter Maydell, 2015/07/22
- [Qemu-devel] [PATCH 04/12] compiler.h: Use glue() in QEMU_BUILD_BUG_ON define,
Peter Maydell <=
- [Qemu-devel] [PATCH 09/12] apic_internal.h: Include cpu.h directly, Peter Maydell, 2015/07/22
- [Qemu-devel] [PATCH 03/12] osdep.h: Move some compiler-specific things to compiler.h, Peter Maydell, 2015/07/22
- [Qemu-devel] [PATCH 07/12] osdep.h: Add header comment, Peter Maydell, 2015/07/22
- [Qemu-devel] [PATCH 08/12] qemu-common.h: Move muldiv64() to host-utils.h, Peter Maydell, 2015/07/22
- [Qemu-devel] [PATCH 02/12] osdep.h: Remove qemu_printf, Peter Maydell, 2015/07/22