summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2013-07-30 22:41:23 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2013-07-30 18:48:21 -0500
commit5fe0d351b3a7caf77f899db804d09e4553329c84 (patch)
tree1c6f65888ef37a855edc2f4d008936985a0a88d5
parentbeb3faaa0027c114e37317fdba38a8a7facf3f9b (diff)
downloadfocaccia-qemu-5fe0d351b3a7caf77f899db804d09e4553329c84.tar.gz
focaccia-qemu-5fe0d351b3a7caf77f899db804d09e4553329c84.zip
tci: Fix broken build (compiler warning caused by redefined macro BIT)
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>
Message-id: 1375216883-23969-1-git-send-email-sw@weilnetz.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--tcg/tci/tcg-target.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/tcg/tci/tcg-target.c b/tcg/tci/tcg-target.c
index d1241b5692..e118bc7179 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)