diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2017-01-31 16:29:51 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2017-02-01 03:37:17 +0200 |
| commit | 60abf0a5e05134187e274ce5f32524ccf0cae1a6 (patch) | |
| tree | 0039235376ddce1664c77e6425177138c3b8449e | |
| parent | 32f825dece6482297fc1b9b0e3bf31424529688a (diff) | |
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 <mst@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | include/qemu/compiler.h | 6 |
1 files changed, 5 insertions, 1 deletions
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) |