aboutsummaryrefslogtreecommitdiff
path: root/slirp/slirp.h
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-03-22 01:02:51 +0100
committerJan Kiszka <jan.kiszka@siemens.com>2012-03-28 20:33:16 +0200
commitb72210568ef0c0fb141a01cffb71a09c4efa0364 (patch)
treef2f41b628a5e8239b29a900c0888d4b73e9dd476 /slirp/slirp.h
parent1658dd32408c75e850b55ab0ff70d5cc402674d5 (diff)
slirp: clean up conflicts with system headers
Right now, slirp/slirp.h cannot include some system headers and, indirectly, qemu_socket.h. Clean this up, and remove a duplicate prototype that was introduced because of that. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Diffstat (limited to 'slirp/slirp.h')
-rw-r--r--slirp/slirp.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/slirp/slirp.h b/slirp/slirp.h
index 5033ee3118..2098b20e39 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -88,10 +88,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 +140,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 +164,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