yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-25 18:06:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

qlit: Change compound literals to initializers

Browse source 
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.

Backports commit d5cd8fbf130312bea91823c41de87d55818d599b from qemu
This commit is contained in:
Marc-André Lureau 2018-03-07 17:13:12 -05:00 committed by Lioncash
parent a5d527ca72
commit b462c3929f
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
qemu/include/qapi/qmp/qlit.h
View file

@ -36,13 +36,13 @@ struct QLitDictEntry {
}; };
#define QLIT_QNUM(val) \ #define QLIT_QNUM(val) \
(QLitObject){.type = QTYPE_QNUM, .value.qnum = (val)} { .type = QTYPE_QNUM, .value.qnum = (val) }
#define QLIT_QSTR(val) \ #define QLIT_QSTR(val) \
(QLitObject){.type = QTYPE_QSTRING, .value.qstr = (val)} { .type = QTYPE_QSTRING, .value.qstr = (val) }
#define QLIT_QDICT(val) \ #define QLIT_QDICT(val) \
(QLitObject){.type = QTYPE_QDICT, .value.qdict = (val)} { .type = QTYPE_QDICT, .value.qdict = (val) }
#define QLIT_QLIST(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); int compare_litqobj_to_qobj(QLitObject *lhs, QObject *rhs);