qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Marcel Apfelbaum <marcel.a@redhat.com>
To: Stefan Weil <sw@weilnetz.de>
Cc: qemu-trivial <qemu-trivial@nongnu.org>,
	Anthony Liguori <aliguori@us.ibm.com>,
	qemu-devel <qemu-devel@nongnu.org>
Subject: Re: [Qemu-devel] [PATCH for 1.6] tci: Fix broken build (compiler warning caused by redefined macro BIT)
Date: Wed, 31 Jul 2013 10:02:18 +0300	[thread overview]
Message-ID: <1375254138.2561.5.camel@localhost.localdomain> (raw)
In-Reply-To: <1375216883-23969-1-git-send-email-sw@weilnetz.de>

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)
>  

  reply	other threads:[~2013-07-31  7:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2013-08-02 12:34 ` Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1375254138.2561.5.camel@localhost.localdomain \
    --to=marcel.a@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=sw@weilnetz.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).