aboutsummaryrefslogtreecommitdiff
path: root/slirp
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-01-29 17:49:59 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-02-04 17:41:30 +0000
commit7df7482bf6a6c2c69013cdbde58b57ca8716db17 (patch)
tree2e14612d55da6291c8fced942b6fa148b94d04a1 /slirp
parent4459bf3866c380cc1e7cbb8771eee7b503d1163a (diff)
downloadqemu-arm-7df7482bf6a6c2c69013cdbde58b57ca8716db17.tar.gz
slirp: Clean up includes
Clean up includes so that osdep.h is included first and headers which it implies are not included manually. This commit was created with scripts/clean-includes. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1454089805-5470-10-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'slirp')
-rw-r--r--slirp/arp_table.c1
-rw-r--r--slirp/bootp.c1
-rw-r--r--slirp/cksum.c1
-rw-r--r--slirp/dnssearch.c4
-rw-r--r--slirp/if.c1
-rw-r--r--slirp/ip_icmp.c1
-rw-r--r--slirp/ip_input.c1
-rw-r--r--slirp/ip_output.c1
-rw-r--r--slirp/mbuf.c1
-rw-r--r--slirp/misc.c1
-rw-r--r--slirp/sbuf.c1
-rw-r--r--slirp/slirp.c1
-rw-r--r--slirp/socket.c1
-rw-r--r--slirp/tcp_input.c1
-rw-r--r--slirp/tcp_output.c1
-rw-r--r--slirp/tcp_subr.c1
-rw-r--r--slirp/tcp_timer.c1
-rw-r--r--slirp/tftp.c1
-rw-r--r--slirp/udp.c1
19 files changed, 19 insertions, 3 deletions
diff --git a/slirp/arp_table.c b/slirp/arp_table.c
index bcaeb44860..3547043555 100644
--- a/slirp/arp_table.c
+++ b/slirp/arp_table.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "slirp.h"
void arp_table_add(Slirp *slirp, uint32_t ip_addr, uint8_t ethaddr[ETH_ALEN])
diff --git a/slirp/bootp.c b/slirp/bootp.c
index 00272793e0..7b3232bdc4 100644
--- a/slirp/bootp.c
+++ b/slirp/bootp.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <slirp.h>
#if defined(_WIN32)
diff --git a/slirp/cksum.c b/slirp/cksum.c
index 63286600e7..bc0d017d24 100644
--- a/slirp/cksum.c
+++ b/slirp/cksum.c
@@ -30,6 +30,7 @@
* in_cksum.c,v 1.2 1994/08/02 07:48:16 davidg Exp
*/
+#include "qemu/osdep.h"
#include <slirp.h>
/*
diff --git a/slirp/dnssearch.c b/slirp/dnssearch.c
index 4c9064ecb6..aed2f13af5 100644
--- a/slirp/dnssearch.c
+++ b/slirp/dnssearch.c
@@ -22,9 +22,7 @@
* THE SOFTWARE.
*/
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include "qemu/osdep.h"
#include <glib.h>
#include "slirp.h"
diff --git a/slirp/if.c b/slirp/if.c
index 8325a2afb5..93d7cc0b43 100644
--- a/slirp/if.c
+++ b/slirp/if.c
@@ -5,6 +5,7 @@
* terms and conditions of the copyright.
*/
+#include "qemu/osdep.h"
#include <slirp.h>
#include "qemu/timer.h"
diff --git a/slirp/ip_icmp.c b/slirp/ip_icmp.c
index 592f33a827..ace39821d9 100644
--- a/slirp/ip_icmp.c
+++ b/slirp/ip_icmp.c
@@ -30,6 +30,7 @@
* ip_icmp.c,v 1.7 1995/05/30 08:09:42 rgrimes Exp
*/
+#include "qemu/osdep.h"
#include "slirp.h"
#include "ip_icmp.h"
diff --git a/slirp/ip_input.c b/slirp/ip_input.c
index 7d436e6ecc..e4855ae0f0 100644
--- a/slirp/ip_input.c
+++ b/slirp/ip_input.c
@@ -38,6 +38,7 @@
* terms and conditions of the copyright.
*/
+#include "qemu/osdep.h"
#include <slirp.h>
#include <qemu/osdep.h>
#include "ip_icmp.h"
diff --git a/slirp/ip_output.c b/slirp/ip_output.c
index 1254d0d585..0d6b3b8312 100644
--- a/slirp/ip_output.c
+++ b/slirp/ip_output.c
@@ -38,6 +38,7 @@
* terms and conditions of the copyright.
*/
+#include "qemu/osdep.h"
#include <slirp.h>
/* Number of packets queued before we start sending
diff --git a/slirp/mbuf.c b/slirp/mbuf.c
index bc942b63e4..c959758465 100644
--- a/slirp/mbuf.c
+++ b/slirp/mbuf.c
@@ -15,6 +15,7 @@
* the flags
*/
+#include "qemu/osdep.h"
#include <slirp.h>
#define MBUF_THRESH 30
diff --git a/slirp/misc.c b/slirp/misc.c
index 5497161f13..e2eea2e4b3 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -5,6 +5,7 @@
* terms and conditions of the copyright.
*/
+#include "qemu/osdep.h"
#include <slirp.h>
#include <libslirp.h>
diff --git a/slirp/sbuf.c b/slirp/sbuf.c
index b8c3db744f..dd4cb8c139 100644
--- a/slirp/sbuf.c
+++ b/slirp/sbuf.c
@@ -5,6 +5,7 @@
* terms and conditions of the copyright.
*/
+#include "qemu/osdep.h"
#include <slirp.h>
#include <qemu/main-loop.h>
diff --git a/slirp/slirp.c b/slirp/slirp.c
index b900775eff..0466d330da 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/timer.h"
#include "qemu/error-report.h"
diff --git a/slirp/socket.c b/slirp/socket.c
index f7e596859f..2b5453e020 100644
--- a/slirp/socket.c
+++ b/slirp/socket.c
@@ -5,6 +5,7 @@
* terms and conditions of the copyright.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include <slirp.h>
#include "ip_icmp.h"
diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c
index f24e7060a4..2027a7511d 100644
--- a/slirp/tcp_input.c
+++ b/slirp/tcp_input.c
@@ -38,6 +38,7 @@
* terms and conditions of the copyright.
*/
+#include "qemu/osdep.h"
#include <slirp.h>
#include "ip_icmp.h"
diff --git a/slirp/tcp_output.c b/slirp/tcp_output.c
index fafca58a0a..34e4d2e5d4 100644
--- a/slirp/tcp_output.c
+++ b/slirp/tcp_output.c
@@ -38,6 +38,7 @@
* terms and conditions of the copyright.
*/
+#include "qemu/osdep.h"
#include <slirp.h>
static const u_char tcp_outflags[TCP_NSTATES] = {
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index 36e325618d..b1aa1f23f4 100644
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -38,6 +38,7 @@
* terms and conditions of the copyright.
*/
+#include "qemu/osdep.h"
#include <slirp.h>
/* patchable/settable parameters for tcp */
diff --git a/slirp/tcp_timer.c b/slirp/tcp_timer.c
index 6c5bb11cc3..1214c2e6fa 100644
--- a/slirp/tcp_timer.c
+++ b/slirp/tcp_timer.c
@@ -30,6 +30,7 @@
* tcp_timer.c,v 1.2 1994/08/02 07:49:10 davidg Exp
*/
+#include "qemu/osdep.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 ccb613014a..abb010621c 100644
--- a/slirp/tftp.c
+++ b/slirp/tftp.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include <slirp.h>
#include "qemu-common.h"
diff --git a/slirp/udp.c b/slirp/udp.c
index 92c48c491e..6b39cab0c6 100644
--- a/slirp/udp.c
+++ b/slirp/udp.c
@@ -38,6 +38,7 @@
* terms and conditions of the copyright.
*/
+#include "qemu/osdep.h"
#include <slirp.h>
#include "ip_icmp.h"