diff options
| author | Anthony Liguori | 2012-04-02 16:46:45 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2012-04-02 16:46:45 +0200 |
| commit | cefc898806e0346eef87d15ddaac9475b57b7d84 (patch) | |
| tree | ce4a6312d22ba96fe33fd4c5f1f2306807a07422 /slirp/slirp.h | |
| parent | Merge remote-tracking branch 'stefanha/tracing' into staging (diff) | |
| parent | slirp: Signal free input buffer space to io-thread (diff) | |
| download | qemu-cefc898806e0346eef87d15ddaac9475b57b7d84.tar.gz qemu-cefc898806e0346eef87d15ddaac9475b57b7d84.tar.xz qemu-cefc898806e0346eef87d15ddaac9475b57b7d84.zip | |
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
* kiszka/queues/slirp:
slirp: Signal free input buffer space to io-thread
w32/slirp: Undefine error constants before their redefinition
slirp: use socket_set_nonblock
slirp: clean up conflicts with system headers
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 |