diff options
| author | Stefan Weil <sw@weilnetz.de> | 2012-04-12 21:13:15 +0200 |
|---|---|---|
| committer | Stefan Weil <sw@weilnetz.de> | 2012-04-15 21:25:16 +0200 |
| commit | acf126ba58425f11e74fbb9c1095224cb142fffa (patch) | |
| tree | 6ec69a3a5e1622ce6f4f4cf6d3826a1d44d99a59 | |
| parent | 6840981dfb76a1a1d2401efdb237ed5ddac8bf2f (diff) | |
| download | focaccia-qemu-acf126ba58425f11e74fbb9c1095224cb142fffa.tar.gz focaccia-qemu-acf126ba58425f11e74fbb9c1095224cb142fffa.zip | |
w32: Move defines for socket specific errors to qemu-os-win32.h
As those defines are only used for w32, they should be in the header file for w32. All files which include slirp.h or qemu_socket.h also include qemu-os-win32.h. Signed-off-by: Stefan Weil <sw@weilnetz.de>
| -rw-r--r-- | qemu-os-win32.h | 26 | ||||
| -rw-r--r-- | qemu_socket.h | 6 | ||||
| -rw-r--r-- | slirp/slirp.h | 12 |
3 files changed, 26 insertions, 18 deletions
diff --git a/qemu-os-win32.h b/qemu-os-win32.h index 8eda4bdc20..b6533c0979 100644 --- a/qemu-os-win32.h +++ b/qemu-os-win32.h @@ -30,6 +30,32 @@ #include <winsock2.h> #include "main-loop.h" +/* Workaround for older versions of MinGW. */ +#ifndef ECONNREFUSED +# define ECONNREFUSED WSAECONNREFUSED +#endif +#ifndef EINPROGRESS +# define EINPROGRESS WSAEINPROGRESS +#endif +#ifndef EHOSTUNREACH +# define EHOSTUNREACH WSAEHOSTUNREACH +#endif +#ifndef EINTR +# define EINTR WSAEINTR +#endif +#ifndef EINPROGRESS +# define EINPROGRESS WSAEINPROGRESS +#endif +#ifndef ENETUNREACH +# define ENETUNREACH WSAENETUNREACH +#endif +#ifndef ENOTCONN +# define ENOTCONN WSAENOTCONN +#endif +#ifndef EWOULDBLOCK +# define EWOULDBLOCK WSAEWOULDBLOCK +#endif + /* Declaration of ffs() is missing in MinGW's strings.h. */ int ffs(int i); diff --git a/qemu_socket.h b/qemu_socket.h index 51ad210a7f..a5d0a84fb6 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -8,12 +8,6 @@ #include <ws2tcpip.h> #define socket_error() WSAGetLastError() -#undef EWOULDBLOCK -#undef EINTR -#undef EINPROGRESS -#define EWOULDBLOCK WSAEWOULDBLOCK -#define EINTR WSAEINTR -#define EINPROGRESS WSAEINPROGRESS int inet_aton(const char *cp, struct in_addr *ia); diff --git a/slirp/slirp.h b/slirp/slirp.h index 46bfe4636d..f2c5eca892 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -15,18 +15,6 @@ typedef char *caddr_t; # include <sys/timeb.h> # include <iphlpapi.h> -# undef EWOULDBLOCK -# undef EINPROGRESS -# undef ENOTCONN -# undef EHOSTUNREACH -# undef ENETUNREACH -# undef ECONNREFUSED -# define EWOULDBLOCK WSAEWOULDBLOCK -# define EINPROGRESS WSAEINPROGRESS -# define ENOTCONN WSAENOTCONN -# define EHOSTUNREACH WSAEHOSTUNREACH -# define ENETUNREACH WSAENETUNREACH -# define ECONNREFUSED WSAECONNREFUSED #else # define ioctlsocket ioctl # define closesocket(s) close(s) |