| Message ID | 1375216883-23969-1-git-send-email-sw@weilnetz.de |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, 2013-07-30 at 22:41 +0200, Stefan Weil wrote: > 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). I would add explicit "#include qemu/bitops.h" For some reason the compilation was ok when the path was submitted, thanks! Marcel > > Signed-off-by: Stefan Weil <sw@weilnetz.de> > --- > 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) >
Applied. Thanks. Regards, Anthony Liguori
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)
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 <sw@weilnetz.de> --- tcg/tci/tcg-target.c | 3 --- 1 file changed, 3 deletions(-)