similarity index 96%
rename from slirp/libslirp.h
rename to include/slirp/libslirp.h
@@ -3,6 +3,11 @@
#include "qemu-common.h"
+#ifndef _WIN32
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+
struct Slirp;
typedef struct Slirp Slirp;
@@ -24,7 +24,7 @@
#include "qemu-common.h"
#include "qemu-timer.h"
-#include "slirp/slirp.h"
+#include "slirp/libslirp.h"
#include "main-loop.h"
#ifndef _WIN32
@@ -6,7 +6,6 @@
*/
#include <slirp.h>
-#include <libslirp.h>
#include "monitor.h"
@@ -66,11 +66,6 @@ typedef char *caddr_t;
#include <sys/uio.h>
#endif
-#ifndef _WIN32
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif
-
/* Systems lacking strdup() definition in <string.h>. */
#if defined(ultrix)
char *strdup(const char *);
@@ -136,7 +131,7 @@ void free(void *ptr);
#include "qemu-queue.h"
#include "qemu_socket.h"
-#include "libslirp.h"
+#include "slirp/libslirp.h"
#include "ip.h"
#include "tcp.h"
#include "tcp_timer.h"
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- {slirp => include/slirp}/libslirp.h | 5 +++++ main-loop.c | 2 +- slirp/misc.c | 1 - slirp/slirp.h | 7 +------ 4 files changed, 7 insertions(+), 8 deletions(-) rename {slirp => include/slirp}/libslirp.h (96%)