aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2013-01-21 07:49:51 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2013-01-21 11:39:15 +0100
commit09a021fb7ceb7255ab106999d7b38ffd92c3bdd6 (patch)
tree4381018921ea817bafca4fa8fe7691634de95b60
parentacf15c8949f125a4d4f958a5134f8eeece1f99f5 (diff)
downloadqemu-arm-09a021fb7ceb7255ab106999d7b38ffd92c3bdd6.tar.gz
hw/tpci200: Fix compiler warning (redefined symbol with MinGW)
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 <sw@weilnetz.de> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--hw/tpci200.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/tpci200.c b/hw/tpci200.c
index e082bca965..a4823fb9f2 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);
}
}