From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxF6e-0004xh-T2 for qemu-devel@nongnu.org; Mon, 21 Jan 2013 06:00:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TxF6c-000703-Co for qemu-devel@nongnu.org; Mon, 21 Jan 2013 06:00:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:65316) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxF6c-0006zz-31 for qemu-devel@nongnu.org; Mon, 21 Jan 2013 05:59:58 -0500 From: Stefan Hajnoczi Date: Mon, 21 Jan 2013 11:59:43 +0100 Message-Id: <1358765983-30201-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1358765983-30201-1-git-send-email-stefanha@redhat.com> References: <1358765983-30201-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] hw/tpci200: Fix compiler warning (redefined symbol with MinGW) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Weil , Anthony Liguori , Stefan Hajnoczi From: Stefan Weil STATUS_TIMEOUT is defined in winnt.h: CC hw/tpci200.o hw/tpci200.c:34:0: warning: "STATUS_TIMEOUT" redefined [enabled by default] /usr/lib/gcc/x86_64-w64-mingw32/4.6/../../../../x86_64-w64-mingw32/include/winnt.h:1036:0: note: this is the location of the previous definition Use STATUS_TIME instead of STATUS_TIMEOUT as suggested by Alberto Garcia. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- hw/tpci200.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/tpci200.c b/hw/tpci200.c index e082bca..a4823fb 100644 --- a/hw/tpci200.c +++ b/hw/tpci200.c @@ -31,7 +31,7 @@ #define IP_INT_SPACE_ADDR_MASK 0x3F #define STATUS_INT(IP, INTNO) BIT((IP) * 2 + (INTNO)) -#define STATUS_TIMEOUT(IP) BIT((IP) + 12) +#define STATUS_TIME(IP) BIT((IP) + 12) #define STATUS_ERR_ANY 0xF00 #define CTRL_CLKRATE BIT(0) @@ -279,9 +279,9 @@ static void tpci200_write_las0(void *opaque, hwaddr addr, uint64_t val, } } - if (val & STATUS_TIMEOUT(i)) { + if (val & STATUS_TIME(i)) { DPRINTF("Clear IP %c timeout\n", 'A' + i); - s->status &= ~STATUS_TIMEOUT(i); + s->status &= ~STATUS_TIME(i); } } -- 1.8.1