From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEhPX-0002kg-Gq for qemu-devel@nongnu.org; Thu, 20 Sep 2012 10:07:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TEhPP-0001Tu-0b for qemu-devel@nongnu.org; Thu, 20 Sep 2012 10:07:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36507) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEhPO-0001TN-OR for qemu-devel@nongnu.org; Thu, 20 Sep 2012 10:07:14 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8KE7DMc001437 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 20 Sep 2012 10:07:13 -0400 Date: Thu, 20 Sep 2012 11:08:04 -0300 From: Luiz Capitulino Message-ID: <20120920110804.7536e166@doriath.home> In-Reply-To: <1348065078-5139-5-git-send-email-pbonzini@redhat.com> References: <1348065078-5139-1-git-send-email-pbonzini@redhat.com> <1348065078-5139-5-git-send-email-pbonzini@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 04/12] qapi: add "unix" to the set of reserved words List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org On Wed, 19 Sep 2012 16:31:07 +0200 Paolo Bonzini wrote: > It is #defined to 1. > > Signed-off-by: Paolo Bonzini Cherry-picked into qmp branch, thanks. > --- > scripts/qapi.py | 4 +++- > 1 file modificato, 3 inserzioni(+). 1 rimozione(-) > > diff --git a/scripts/qapi.py b/scripts/qapi.py > index 057332e..afc5f32 100644 > --- a/scripts/qapi.py > +++ b/scripts/qapi.py > @@ -156,7 +156,9 @@ def c_var(name, protect=True): > # GCC http://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/C-Extensions.html > # excluding _.* > gcc_words = set(['asm', 'typeof']) > - if protect and (name in c89_words | c99_words | c11_words | gcc_words): > + # namespace pollution: > + polluted_words = set(['unix']) > + if protect and (name in c89_words | c99_words | c11_words | gcc_words | polluted_words): > return "q_" + name > return name.replace('-', '_').lstrip("*") >