diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2017-08-25 12:59:03 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-09-04 13:09:11 +0200 |
| commit | d5cd8fbf130312bea91823c41de87d55818d599b (patch) | |
| tree | 6ff2b4737d5091971453779208cc6cc58cd0c98d /include/qapi | |
| parent | 082696e767db4d2b6c8c8c233d28291b83fc2b21 (diff) | |
| download | qemu-d5cd8fbf130312bea91823c41de87d55818d599b.tar.gz | |
qlit: Change compound literals to initializers
The QLIT_QFOO() macros expand into compound literals. Sadly, gcc
doesn't recognizes these as constant expressions (clang does), which
makes the macros useless for initializing objects with static storage
duration.
There is a gcc bug about it:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71713
Change the macros to expand into initializers.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20170825105913.4060-5-marcandre.lureau@redhat.com>
[Commit message improved]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'include/qapi')
| -rw-r--r-- | include/qapi/qmp/qlit.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/qapi/qmp/qlit.h b/include/qapi/qmp/qlit.h index a4ad91321b..f1d6eed317 100644 --- a/include/qapi/qmp/qlit.h +++ b/include/qapi/qmp/qlit.h @@ -36,13 +36,13 @@ struct QLitDictEntry { }; #define QLIT_QNUM(val) \ - (QLitObject){.type = QTYPE_QNUM, .value.qnum = (val)} + { .type = QTYPE_QNUM, .value.qnum = (val) } #define QLIT_QSTR(val) \ - (QLitObject){.type = QTYPE_QSTRING, .value.qstr = (val)} + { .type = QTYPE_QSTRING, .value.qstr = (val) } #define QLIT_QDICT(val) \ - (QLitObject){.type = QTYPE_QDICT, .value.qdict = (val)} + { .type = QTYPE_QDICT, .value.qdict = (val) } #define QLIT_QLIST(val) \ - (QLitObject){.type = QTYPE_QLIST, .value.qlist = (val)} + { .type = QTYPE_QLIST, .value.qlist = (val) } int compare_litqobj_to_qobj(QLitObject *lhs, QObject *rhs); |