diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-10 08:10:41 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-10 08:10:41 -0500 |
| commit | 72fe3aaed94936739abfa158fa28f147b75ae9ff (patch) | |
| tree | dc7f090fe72b645a5b489ade9088d2125eb8a934 /qemu_socket.h | |
| parent | 2c097f6003f2a11416706ae3252c2860ed2257a9 (diff) | |
| parent | 53fbf7b5391c76cc474d469bfed6a69a1243f4de (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
make: fix clean rule by removing build file in qom/
configure: Link qga against UST tracing related libraries
configure: Link QEMU against 'liburcu-bp'
main-loop: make qemu_event_handle static
block/curl: Replace usleep by g_usleep
qtest: Add missing GCC_FMT_ATTR
w32: Undefine error constants before their redefinition
configure: fix mingw32 libs_qga typo
Diffstat (limited to 'qemu_socket.h')
| -rw-r--r-- | qemu_socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
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 |