From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPDBT-00031s-C5 for qemu-devel@nongnu.org; Fri, 29 Jan 2016 12:50:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPDBR-0001vt-Sa for qemu-devel@nongnu.org; Fri, 29 Jan 2016 12:50:11 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:59685) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPDBR-0001uk-Kc for qemu-devel@nongnu.org; Fri, 29 Jan 2016 12:50:09 -0500 From: Peter Maydell Date: Fri, 29 Jan 2016 17:49:59 +0000 Message-Id: <1454089805-5470-10-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1454089805-5470-1-git-send-email-peter.maydell@linaro.org> References: <1454089805-5470-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 09/15] slirp: Clean up includes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org 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 --- 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 bcaeb44..3547043 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 1baaab1..ba953ae 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 6328660..bc0d017 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 4c9064e..aed2f13 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 8325a2a..93d7cc0 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 23b9f0f..92b04d7 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 7d436e6..e4855ae 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 1254d0d..0d6b3b8 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 795fc29..8b99a28 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 5497161..e2eea2e 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 b8c3db7..dd4cb8c 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 35f819a..d3dc609 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 "sysemu/char.h" diff --git a/slirp/socket.c b/slirp/socket.c index 1673e3a..634b532 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 6b096ec..de610e3 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 fafca58..34e4d2e 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 e161ed2..499eec3 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 6c5bb11..1214c2e 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 a329fb2..b7b5e21 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 fee13b4..6dfd83d 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" -- 1.9.1