* [Qemu-devel] [PATCH for 1.6] tci: Fix broken build (compiler warning caused by redefined macro BIT)
@ 2013-07-30 20:41 Stefan Weil
2013-07-31 7:02 ` Marcel Apfelbaum
2013-08-02 12:34 ` Anthony Liguori
0 siblings, 2 replies; 3+ messages in thread
From: Stefan Weil @ 2013-07-30 20:41 UTC (permalink / raw)
To: qemu-trivial; +Cc: Stefan Weil, Anthony Liguori, qemu-devel, Marcel Apfelbaum
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(-)
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)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH for 1.6] tci: Fix broken build (compiler warning caused by redefined macro BIT)
2013-07-30 20:41 [Qemu-devel] [PATCH for 1.6] tci: Fix broken build (compiler warning caused by redefined macro BIT) Stefan Weil
@ 2013-07-31 7:02 ` Marcel Apfelbaum
2013-08-02 12:34 ` Anthony Liguori
1 sibling, 0 replies; 3+ messages in thread
From: Marcel Apfelbaum @ 2013-07-31 7:02 UTC (permalink / raw)
To: Stefan Weil; +Cc: qemu-trivial, Anthony Liguori, qemu-devel
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)
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH for 1.6] tci: Fix broken build (compiler warning caused by redefined macro BIT)
2013-07-30 20:41 [Qemu-devel] [PATCH for 1.6] tci: Fix broken build (compiler warning caused by redefined macro BIT) Stefan Weil
2013-07-31 7:02 ` Marcel Apfelbaum
@ 2013-08-02 12:34 ` Anthony Liguori
1 sibling, 0 replies; 3+ messages in thread
From: Anthony Liguori @ 2013-08-02 12:34 UTC (permalink / raw)
To: Stefan Weil, qemu-trivial; +Cc: Anthony Liguori, qemu-devel, Marcel Apfelbaum
Applied. Thanks.
Regards,
Anthony Liguori
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-08-02 12:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-30 20:41 [Qemu-devel] [PATCH for 1.6] tci: Fix broken build (compiler warning caused by redefined macro BIT) Stefan Weil
2013-07-31 7:02 ` Marcel Apfelbaum
2013-08-02 12:34 ` Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).