From 7df7482bf6a6c2c69013cdbde58b57ca8716db17 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 29 Jan 2016 17:49:59 +0000 Subject: [PATCH] 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 Message-id: 1454089805-5470-10-git-send-email-peter.maydell@linaro.org --- slirp/arp_table.c | 1 + slirp/bootp.c | 1 + slirp/cksum.c | 1 + slirp/dnssearch.c | 4 +--- slirp/if.c | 1 + slirp/ip_icmp.c | 1 + slirp/ip_input.c | 1 + slirp/ip_output.c | 1 + slirp/mbuf.c | 1 + slirp/misc.c | 1 + slirp/sbuf.c | 1 + slirp/slirp.c | 1 + slirp/socket.c | 1 + slirp/tcp_input.c | 1 + slirp/tcp_output.c | 1 + slirp/tcp_subr.c | 1 + slirp/tcp_timer.c | 1 + slirp/tftp.c | 1 + slirp/udp.c | 1 + 19 files changed, 19 insertions(+), 3 deletions(-) diff --git a/slirp/arp_table.c b/slirp/arp_table.c index bcaeb448605..3547043555d 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 00272793e07..7b3232bdc4b 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 #if defined(_WIN32) diff --git a/slirp/cksum.c b/slirp/cksum.c index 63286600e7c..bc0d017d248 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 /* diff --git a/slirp/dnssearch.c b/slirp/dnssearch.c index 4c9064ecb68..aed2f13af50 100644 --- a/slirp/dnssearch.c +++ b/slirp/dnssearch.c @@ -22,9 +22,7 @@ * THE SOFTWARE. */ -#include -#include -#include +#include "qemu/osdep.h" #include #include "slirp.h" diff --git a/slirp/if.c b/slirp/if.c index 8325a2afb55..93d7cc0b43d 100644 --- a/slirp/if.c +++ b/slirp/if.c @@ -5,6 +5,7 @@ * terms and conditions of the copyright. */ +#include "qemu/osdep.h" #include #include "qemu/timer.h" diff --git a/slirp/ip_icmp.c b/slirp/ip_icmp.c index 592f33a8273..ace39821d99 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 7d436e6ecc4..e4855ae0f08 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 #include #include "ip_icmp.h" diff --git a/slirp/ip_output.c b/slirp/ip_output.c index 1254d0d585a..0d6b3b8312b 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 /* Number of packets queued before we start sending diff --git a/slirp/mbuf.c b/slirp/mbuf.c index bc942b63e49..c959758465b 100644 --- a/slirp/mbuf.c +++ b/slirp/mbuf.c @@ -15,6 +15,7 @@ * the flags */ +#include "qemu/osdep.h" #include #define MBUF_THRESH 30 diff --git a/slirp/misc.c b/slirp/misc.c index 5497161f136..e2eea2e4b31 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -5,6 +5,7 @@ * terms and conditions of the copyright. */ +#include "qemu/osdep.h" #include #include diff --git a/slirp/sbuf.c b/slirp/sbuf.c index b8c3db744f0..dd4cb8c1396 100644 --- a/slirp/sbuf.c +++ b/slirp/sbuf.c @@ -5,6 +5,7 @@ * terms and conditions of the copyright. */ +#include "qemu/osdep.h" #include #include diff --git a/slirp/slirp.c b/slirp/slirp.c index b900775effd..0466d330dab 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 f7e596859fe..2b5453e0205 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 #include "ip_icmp.h" diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c index f24e7060a40..2027a7511d4 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 #include "ip_icmp.h" diff --git a/slirp/tcp_output.c b/slirp/tcp_output.c index fafca58a0a1..34e4d2e5d4f 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 static const u_char tcp_outflags[TCP_NSTATES] = { diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c index 36e325618da..b1aa1f23f4b 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 /* patchable/settable parameters for tcp */ diff --git a/slirp/tcp_timer.c b/slirp/tcp_timer.c index 6c5bb11cc39..1214c2e6fa9 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 static struct tcpcb *tcp_timers(register struct tcpcb *tp, int timer); diff --git a/slirp/tftp.c b/slirp/tftp.c index ccb613014ad..abb010621c4 100644 --- a/slirp/tftp.c +++ b/slirp/tftp.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include #include "qemu-common.h" diff --git a/slirp/udp.c b/slirp/udp.c index 92c48c491e8..6b39cab0c65 100644 --- a/slirp/udp.c +++ b/slirp/udp.c @@ -38,6 +38,7 @@ * terms and conditions of the copyright. */ +#include "qemu/osdep.h" #include #include "ip_icmp.h" -- 2.39.5