aboutsummaryrefslogtreecommitdiff
path: root/slirp
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2016-06-22 19:11:19 +0200
committerMarkus Armbruster <armbru@redhat.com>2016-07-12 16:19:16 +0200
commita9c94277f07d19d3eb14f199c3e93491aa3eae0e (patch)
treefbacb9207afd71c3ad206a4099099d95b7824c16 /slirp
parentb35399bb4e9968296a12303b00f9f2066470e987 (diff)
downloadqemu-arm-a9c94277f07d19d3eb14f199c3e93491aa3eae0e.tar.gz
Use #include "..." for our own headers, <...> for others
Tracked down with an ugly, brittle and probably buggy Perl script. Also move includes converted to <...> up so they get included before ours where that's obviously okay. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Tested-by: Eric Blake <eblake@redhat.com> Reviewed-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'slirp')
-rw-r--r--slirp/bootp.c2
-rw-r--r--slirp/cksum.c2
-rw-r--r--slirp/if.c2
-rw-r--r--slirp/ip_input.c2
-rw-r--r--slirp/ip_output.c2
-rw-r--r--slirp/mbuf.c2
-rw-r--r--slirp/misc.c5
-rw-r--r--slirp/sbuf.c4
-rw-r--r--slirp/socket.c2
-rw-r--r--slirp/tcp_input.c2
-rw-r--r--slirp/tcp_output.c2
-rw-r--r--slirp/tcp_subr.c2
-rw-r--r--slirp/tcp_timer.c2
-rw-r--r--slirp/tftp.c2
-rw-r--r--slirp/udp.c2
15 files changed, 17 insertions, 18 deletions
diff --git a/slirp/bootp.c b/slirp/bootp.c
index 7b3232bdc4..5a4646c182 100644
--- a/slirp/bootp.c
+++ b/slirp/bootp.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
#if defined(_WIN32)
/* Windows ntohl() returns an u_long value.
diff --git a/slirp/cksum.c b/slirp/cksum.c
index 2ad0e6540d..6d73abf4a0 100644
--- a/slirp/cksum.c
+++ b/slirp/cksum.c
@@ -31,7 +31,7 @@
*/
#include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
/*
* Checksum routine for Internet Protocol family headers (Portable Version).
diff --git a/slirp/if.c b/slirp/if.c
index 9b02180db0..51ae0d0e9a 100644
--- a/slirp/if.c
+++ b/slirp/if.c
@@ -6,7 +6,7 @@
*/
#include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
#include "qemu/timer.h"
static void
diff --git a/slirp/ip_input.c b/slirp/ip_input.c
index 34fba2b7dd..348e1dca5a 100644
--- a/slirp/ip_input.c
+++ b/slirp/ip_input.c
@@ -39,7 +39,7 @@
*/
#include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
#include "ip_icmp.h"
static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp);
diff --git a/slirp/ip_output.c b/slirp/ip_output.c
index 0d6b3b8312..db403f04c1 100644
--- a/slirp/ip_output.c
+++ b/slirp/ip_output.c
@@ -39,7 +39,7 @@
*/
#include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
/* Number of packets queued before we start sending
* (to prevent allocing too many mbufs) */
diff --git a/slirp/mbuf.c b/slirp/mbuf.c
index d136988397..7eddc217e4 100644
--- a/slirp/mbuf.c
+++ b/slirp/mbuf.c
@@ -16,7 +16,7 @@
*/
#include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
#define MBUF_THRESH 30
diff --git a/slirp/misc.c b/slirp/misc.c
index 1a0ea1be4e..88e9d94197 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -6,9 +6,8 @@
*/
#include "qemu/osdep.h"
-#include <slirp.h>
-#include <libslirp.h>
-
+#include "slirp.h"
+#include "libslirp.h"
#include "monitor/monitor.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
diff --git a/slirp/sbuf.c b/slirp/sbuf.c
index dd4cb8c139..10119d3ad5 100644
--- a/slirp/sbuf.c
+++ b/slirp/sbuf.c
@@ -6,8 +6,8 @@
*/
#include "qemu/osdep.h"
-#include <slirp.h>
-#include <qemu/main-loop.h>
+#include "slirp.h"
+#include "qemu/main-loop.h"
static void sbappendsb(struct sbuf *sb, struct mbuf *m);
diff --git a/slirp/socket.c b/slirp/socket.c
index 02e89ce1f2..280050a21f 100644
--- a/slirp/socket.c
+++ b/slirp/socket.c
@@ -7,7 +7,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include <slirp.h>
+#include "slirp.h"
#include "ip_icmp.h"
#ifdef __sun__
#include <sys/filio.h>
diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c
index e2b5d4ebbb..c5063a918d 100644
--- a/slirp/tcp_input.c
+++ b/slirp/tcp_input.c
@@ -39,7 +39,7 @@
*/
#include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
#include "ip_icmp.h"
#define TCPREXMTTHRESH 3
diff --git a/slirp/tcp_output.c b/slirp/tcp_output.c
index 99b0a9b1cb..819db27348 100644
--- a/slirp/tcp_output.c
+++ b/slirp/tcp_output.c
@@ -39,7 +39,7 @@
*/
#include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
static const u_char tcp_outflags[TCP_NSTATES] = {
TH_RST|TH_ACK, 0, TH_SYN, TH_SYN|TH_ACK,
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index 6b9fef2008..ed16e1807f 100644
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -39,7 +39,7 @@
*/
#include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
/* patchable/settable parameters for tcp */
/* Don't do rfc1323 performance enhancements */
diff --git a/slirp/tcp_timer.c b/slirp/tcp_timer.c
index 8f5dd772ad..f9060c7bf8 100644
--- a/slirp/tcp_timer.c
+++ b/slirp/tcp_timer.c
@@ -31,7 +31,7 @@
*/
#include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
static struct tcpcb *tcp_timers(register struct tcpcb *tp, int timer);
diff --git a/slirp/tftp.c b/slirp/tftp.c
index 367340222d..c1859066cc 100644
--- a/slirp/tftp.c
+++ b/slirp/tftp.c
@@ -23,7 +23,7 @@
*/
#include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
#include "qemu-common.h"
#include "qemu/cutils.h"
diff --git a/slirp/udp.c b/slirp/udp.c
index 247024fd86..93d7224792 100644
--- a/slirp/udp.c
+++ b/slirp/udp.c
@@ -39,7 +39,7 @@
*/
#include "qemu/osdep.h"
-#include <slirp.h>
+#include "slirp.h"
#include "ip_icmp.h"
static uint8_t udp_tos(struct socket *so);