Patchwork [19/32] slirp: move public header file to include/slirp/

login
register
mail settings
Submitter Paolo Bonzini
Date Oct. 24, 2012, 12:58 p.m.
Message ID <1351083542-15272-20-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/193792/
State New
Headers show

Comments

Paolo Bonzini - Oct. 24, 2012, 12:58 p.m.
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%)

Patch

diff --git a/slirp/libslirp.h b/include/slirp/libslirp.h
similarity index 96%
rename from slirp/libslirp.h
rename to include/slirp/libslirp.h
index 9b471b5..ee4ef7b 100644
--- a/slirp/libslirp.h
+++ b/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;
 
diff --git a/main-loop.c b/main-loop.c
index eb3b6e6..154aa5e 100644
--- a/main-loop.c
+++ b/main-loop.c
@@ -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
diff --git a/slirp/misc.c b/slirp/misc.c
index 0bee864..bb1e998 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -6,7 +6,6 @@ 
  */
 
 #include <slirp.h>
-#include <libslirp.h>
 
 #include "monitor.h"
 
diff --git a/slirp/slirp.h b/slirp/slirp.h
index f2c5eca..acd0276 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.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"