From patchwork Thu Sep 27 13:28:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 187359 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4421B2C00A4 for ; Thu, 27 Sep 2012 23:28:39 +1000 (EST) Received: from localhost ([::1]:56789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THE8r-0006Kp-Du for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 09:28:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THE8J-0005Qw-Sn for qemu-devel@nongnu.org; Thu, 27 Sep 2012 09:28:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THE8F-0003Wp-HL for qemu-devel@nongnu.org; Thu, 27 Sep 2012 09:28:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50861) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THE8F-0003Wl-8r for qemu-devel@nongnu.org; Thu, 27 Sep 2012 09:27:59 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8RDRwYb024391 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 27 Sep 2012 09:27:58 -0400 Received: from localhost (ovpn-113-87.phx2.redhat.com [10.3.113.87]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q8RDRvQb028597; Thu, 27 Sep 2012 09:27:58 -0400 From: Luiz Capitulino To: aliguori@us.ibm.com Date: Thu, 27 Sep 2012 10:28:19 -0300 Message-Id: <1348752509-1142-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1348752509-1142-1-git-send-email-lcapitulino@redhat.com> References: <1348752509-1142-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 05/15] qapi: add "unix" to the set of reserved words X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Paolo Bonzini It is #defined to 1. Signed-off-by: Paolo Bonzini Signed-off-by: Luiz Capitulino --- scripts/qapi.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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("*")