From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnlUm-0000ID-PO for qemu-devel@nongnu.org; Fri, 01 Sep 2017 08:56:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnlUh-0007Jq-7t for qemu-devel@nongnu.org; Fri, 01 Sep 2017 08:56:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52524) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnlUh-0007JA-1w for qemu-devel@nongnu.org; Fri, 01 Sep 2017 08:56:19 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0CF6FC04D288 for ; Fri, 1 Sep 2017 12:56:18 +0000 (UTC) From: Markus Armbruster Date: Fri, 1 Sep 2017 14:55:31 +0200 Message-Id: <20170901125611.29295-8-armbru@redhat.com> In-Reply-To: <20170901125611.29295-1-armbru@redhat.com> References: <20170901125611.29295-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 07/47] qlit: Change compound literals to initializers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau 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=3D71713 Change the macros to expand into initializers. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20170825105913.4060-5-marcandre.lureau@redhat.com> [Commit message improved] Signed-off-by: Markus Armbruster --- include/qapi/qmp/qlit.h | 8 ++++---- 1 file 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 { }; =20 #define QLIT_QNUM(val) \ - (QLitObject){.type =3D QTYPE_QNUM, .value.qnum =3D (val)} + { .type =3D QTYPE_QNUM, .value.qnum =3D (val) } #define QLIT_QSTR(val) \ - (QLitObject){.type =3D QTYPE_QSTRING, .value.qstr =3D (val)} + { .type =3D QTYPE_QSTRING, .value.qstr =3D (val) } #define QLIT_QDICT(val) \ - (QLitObject){.type =3D QTYPE_QDICT, .value.qdict =3D (val)} + { .type =3D QTYPE_QDICT, .value.qdict =3D (val) } #define QLIT_QLIST(val) \ - (QLitObject){.type =3D QTYPE_QLIST, .value.qlist =3D (val)} + { .type =3D QTYPE_QLIST, .value.qlist =3D (val) } =20 int compare_litqobj_to_qobj(QLitObject *lhs, QObject *rhs); =20 --=20 2.13.5