From patchwork Tue Jul 30 20:41:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 263520 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 34E8A2C00C4 for ; Wed, 31 Jul 2013 06:41:55 +1000 (EST) Received: from localhost ([::1]:50393 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4Gjw-0005qU-Dm for incoming@patchwork.ozlabs.org; Tue, 30 Jul 2013 16:41:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4Gja-0005nV-Ed for qemu-devel@nongnu.org; Tue, 30 Jul 2013 16:41:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4GjY-00075n-VD for qemu-devel@nongnu.org; Tue, 30 Jul 2013 16:41:30 -0400 Received: from [2a03:4000:2:362::1] (port=40067 helo=v2201305906712890.yourvserver.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4GjY-00074t-P2; Tue, 30 Jul 2013 16:41:28 -0400 Received: by v2201305906712890.yourvserver.net (Postfix, from userid 1000) id 61D91183F6E; Tue, 30 Jul 2013 22:41:24 +0200 (CEST) From: Stefan Weil To: qemu-trivial Date: Tue, 30 Jul 2013 22:41:23 +0200 Message-Id: <1375216883-23969-1-git-send-email-sw@weilnetz.de> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a03:4000:2:362::1 Cc: Stefan Weil , Anthony Liguori , qemu-devel , Marcel Apfelbaum Subject: [Qemu-devel] [PATCH for 1.6] tci: Fix broken build (compiler warning caused by redefined macro BIT) 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 The definition of macro BIT in tci/tcg-target.c now conflicts with the definition of the same macro in includes qemu/bitops.h. This conflict was triggered by a recent change in the include chain of tcg.c (probably commit 949fc82314cc84162e64a5323764527a542421ce). Signed-off-by: Stefan Weil --- tcg/tci/tcg-target.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tcg/tci/tcg-target.c b/tcg/tci/tcg-target.c index d1241b5..e118bc7 100644 --- a/tcg/tci/tcg-target.c +++ b/tcg/tci/tcg-target.c @@ -34,9 +34,6 @@ tcg_abort(); \ } while (0) -/* Single bit n. */ -#define BIT(n) (1 << (n)) - /* Bitfield n...m (in 32 bit value). */ #define BITS(n, m) (((0xffffffffU << (31 - n)) >> (31 - n + m)) << m)