From 60abf0a5e05134187e274ce5f32524ccf0cae1a6 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Tue, 31 Jan 2017 16:29:51 +0200 Subject: [PATCH] QEMU_BUILD_BUG_ON: use __COUNTER__ Some headers use QEMU_BUILD_BUG_ON. This causes a problem if the C file including that header happens to have QEMU_BUILD_BUG_ON at the same line number. Fix using a widely available extension: __COUNTER__. If unavailable, provide a stub. Signed-off-by: Michael S. Tsirkin Reviewed-by: Markus Armbruster Reviewed-by: Eric Blake --- include/qemu/compiler.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h index 75120826c1..77b9ce3979 100644 --- a/include/qemu/compiler.h +++ b/include/qemu/compiler.h @@ -85,9 +85,13 @@ #define typeof_field(type, field) typeof(((type *)0)->field) #define type_check(t1,t2) ((t1*)0 - (t2*)0) +#ifdef __COUNTER__ #define QEMU_BUILD_BUG_ON(x) \ - typedef char glue(qemu_build_bug_on__, __LINE__)[(x) ? -1 : 1] \ + typedef char glue(qemu_build_bug_on__, __COUNTER__)[(x) ? -1 : 1] \ __attribute__((unused)) +#else +#define QEMU_BUILD_BUG_ON(x) +#endif #if defined __GNUC__ # if !QEMU_GNUC_PREREQ(4, 4)