diff options
Diffstat (limited to 'slirp/slirp.h')
| -rw-r--r-- | slirp/slirp.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/slirp/slirp.h b/slirp/slirp.h index 5033ee3118..46bfe4636d 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -15,6 +15,12 @@ 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 @@ -88,10 +94,6 @@ void *malloc(size_t arg); void free(void *ptr); #endif -#ifndef HAVE_INET_ATON -int inet_aton(const char *cp, struct in_addr *ia); -#endif - #include <fcntl.h> #ifndef NO_UNIX_SOCKETS #include <sys/un.h> @@ -144,6 +146,7 @@ int inet_aton(const char *cp, struct in_addr *ia); #include "debug.h" #include "qemu-queue.h" +#include "qemu_socket.h" #include "libslirp.h" #include "ip.h" @@ -167,9 +170,6 @@ int inet_aton(const char *cp, struct in_addr *ia); #include "bootp.h" #include "tftp.h" -/* osdep.c */ -int qemu_socket(int domain, int type, int protocol); - #define ETH_ALEN 6 #define ETH_HLEN 14 |