Patchwork eepro100: fix compile warning

login
register
mail settings
Submitter Wanlong Gao
Date June 19, 2013, 3:12 a.m.
Message ID <1371611561-5329-1-git-send-email-gaowanlong@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/252467/
State New
Headers show

Comments

Wanlong Gao - June 19, 2013, 3:12 a.m.
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 <gaowanlong@cn.fujitsu.com>
---
 hw/net/eepro100.c | 1 -
 1 file changed, 1 deletion(-)
Stefan Hajnoczi - June 19, 2013, 9:10 a.m.
On Wed, Jun 19, 2013 at 11:12:41AM +0800, Wanlong Gao wrote:
> 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:

This #include does not exist in qemu.git/master.  Therefore this patch
breaks the build.

NACK
Wanlong Gao - June 19, 2013, 9:18 a.m.
On 06/19/2013 05:10 PM, Stefan Hajnoczi wrote:
> On Wed, Jun 19, 2013 at 11:12:41AM +0800, Wanlong Gao wrote:
>> 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:
> 
> This #include does not exist in qemu.git/master.  Therefore this patch
> breaks the build.
> 
> NACK

Oops, sorry it's my fault.

Thanks,
Wanlong Gao

> 
>

Patch

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: */