From patchwork Wed Jun 19 03:12:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanlong Gao X-Patchwork-Id: 252467 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 86EE92C033E for ; Wed, 19 Jun 2013 13:15:02 +1000 (EST) Received: from localhost ([::1]:59523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Up8rK-0005vo-G2 for incoming@patchwork.ozlabs.org; Tue, 18 Jun 2013 23:14:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49087) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Up8r8-0005ty-5s for qemu-devel@nongnu.org; Tue, 18 Jun 2013 23:14:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Up8r7-0006Jn-17 for qemu-devel@nongnu.org; Tue, 18 Jun 2013 23:14:46 -0400 Received: from [222.73.24.84] (port=14747 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Up8r6-0006Ji-Mg for qemu-devel@nongnu.org; Tue, 18 Jun 2013 23:14:44 -0400 X-IronPort-AV: E=Sophos;i="4.87,894,1363104000"; d="scan'208";a="7597329" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 19 Jun 2013 11:11:44 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r5J3Ebri028056; Wed, 19 Jun 2013 11:14:38 +0800 Received: from G08FNSTD121251.fnst.cn.fujitsu.com ([10.167.233.84]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013061911133378-2271746 ; Wed, 19 Jun 2013 11:13:33 +0800 From: Wanlong Gao To: qemu-devel@nongnu.org Date: Wed, 19 Jun 2013 11:12:41 +0800 Message-Id: <1371611561-5329-1-git-send-email-gaowanlong@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.rc2.10.g0c2b1cf X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/19 11:13:34, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/19 11:13:35, Serialize complete at 2013/06/19 11:13:35 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: stefanha@gmail.com, Wanlong Gao Subject: [Qemu-devel] [PATCH] eepro100: fix compile warning 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 hw/net/eepro100.c:108:0: error: "BIT" redefined [-Werror] In file included from /work/git/qemu/include/qemu/bitmap.h:16:0, from /work/git/qemu/include/sysemu/sysemu.h:12, from hw/net/eepro100.c:48: /work/git/qemu/include/qemu/bitops.h:21:0: note: this is the location of the previous definition cc1: all warnings being treated as errors make: *** [hw/net/eepro100.o] Error 1 Signed-off-by: Wanlong Gao --- hw/net/eepro100.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c index dc99ea6..478c688 100644 --- a/hw/net/eepro100.c +++ b/hw/net/eepro100.c @@ -105,7 +105,6 @@ #define PCI_IO_SIZE 64 #define PCI_FLASH_SIZE (128 * KiB) -#define BIT(n) (1 << (n)) #define BITS(n, m) (((0xffffffffU << (31 - n)) >> (31 - n + m)) << m) /* The SCB accepts the following controls for the Tx and Rx units: */