From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Wed, 28 Mar 2012 18:56:38 +0000 (+0200)
Subject: w32: Undefine error constants before their redefinition
X-Git-Tag: v1.1-rc0~127^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6cec29c4a0338bfd96dec42cce51c9c447facb23;p=users%2Fdwmw2%2Fqemu.git

w32: Undefine error constants before their redefinition

Avoids lots of warnings.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---

diff --git a/qemu_socket.h b/qemu_socket.h
index fe4cf6ca61..51ad210a7f 100644
--- a/qemu_socket.h
+++ b/qemu_socket.h
@@ -8,7 +8,9 @@
 #include <ws2tcpip.h>
 
 #define socket_error() WSAGetLastError()
+#undef EWOULDBLOCK
 #undef EINTR
+#undef EINPROGRESS
 #define EWOULDBLOCK WSAEWOULDBLOCK
 #define EINTR       WSAEINTR
 #define EINPROGRESS WSAEINPROGRESS