From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYtTo-0001Tz-Ot for qemu-devel@nongnu.org; Mon, 07 Sep 2015 06:16:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZYtTo-0000Pc-0V for qemu-devel@nongnu.org; Mon, 07 Sep 2015 06:16:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42746) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYtTn-0000PF-SF for qemu-devel@nongnu.org; Mon, 07 Sep 2015 06:16:51 -0400 From: Markus Armbruster Date: Mon, 7 Sep 2015 12:16:20 +0200 Message-Id: <1441621003-2434-10-git-send-email-armbru@redhat.com> In-Reply-To: <1441621003-2434-1-git-send-email-armbru@redhat.com> References: <1441621003-2434-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH RFC v5 09/32] Revert "qapi: Split up some typedefs to ease review" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com This reverts commit 6542034f356ebc6f2818c1c6b8c9a143f817bb2a. Signed-off-by: Markus Armbruster --- scripts/qapi-types.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 124a788..d162ca2 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -15,15 +15,13 @@ from qapi import * def generate_fwd_builtin(name): return mcgen(''' -typedef struct %(name)sList %(name)sList; - -struct %(name)sList { +typedef struct %(name)sList { union { %(type)s value; uint64_t padding; }; struct %(name)sList *next; -}; +} %(name)sList; ''', type=c_type(name), name=name) @@ -33,30 +31,26 @@ def generate_fwd_struct(name): typedef struct %(name)s %(name)s; -typedef struct %(name)sList %(name)sList; - -struct %(name)sList { +typedef struct %(name)sList { union { %(name)s *value; uint64_t padding; }; struct %(name)sList *next; -}; +} %(name)sList; ''', name=c_name(name)) def generate_fwd_enum_struct(name): return mcgen(''' -typedef struct %(name)sList %(name)sList; - -struct %(name)sList { +typedef struct %(name)sList { union { %(name)s value; uint64_t padding; }; struct %(name)sList *next; -}; +} %(name)sList; ''', name=c_name(name)) -- 2.4.3