From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMebg-0006lk-AV for qemu-devel@nongnu.org; Tue, 04 Aug 2015 11:58:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZMebe-0005Oh-Ro for qemu-devel@nongnu.org; Tue, 04 Aug 2015 11:58:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45836) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMebe-0005Nz-MM for qemu-devel@nongnu.org; Tue, 04 Aug 2015 11:58:22 -0400 From: Markus Armbruster Date: Tue, 4 Aug 2015 17:57:53 +0200 Message-Id: <1438703896-12553-10-git-send-email-armbru@redhat.com> In-Reply-To: <1438703896-12553-1-git-send-email-armbru@redhat.com> References: <1438703896-12553-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH RFC v3 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: kwolf@redhat.com, berto@igalia.com, mdroth@linux.vnet.ibm.com This reverts commit c5790fa910530f82cb605778bcd74318c9290279. 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