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 <[email protected]>
Message-id: 1454089805[email protected]

diff --git a/slirp/arp_table.c b/slirp/arp_table.c
index bcaeb4486056ef34e55e971f1e026b6ed106c001..3547043555d050eaf267d2ad34abfd8fe8022ae9 100644 (file)
--- 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 00272793e077d0a62f43d8afd21cefce593be689..7b3232bdc4b0d665a0e637bcefe90b7204932b2b 100644 (file)
--- 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 63286600e7cb1505ad3eceb3d630857272bc66a8..bc0d017d2482eb24443174052228343355db9951 100644 (file)
--- 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 4c9064ecb681737ec992ac519cfee19ef6d4ec22..aed2f13af50d0392b318267364d2369143fc4741 100644 (file)
--- 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 8325a2afb55059a5585c4fc78005735e9b80d87d..93d7cc0b43d4c09d0dd5879a0a236948ce84f62d 100644 (file)
--- 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 592f33a82738215e92a1e47cd23961ba4d03c7a5..ace39821d9907c5b7ccea991da209c76c196d0aa 100644 (file)
--- 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 7d436e6ecc4f9b4d0046fa245c33ec32ee0a4fc7..e4855ae0f08f4ccc23f10d9c8c7c2ed8c5f27899 100644 (file)
--- 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 1254d0d585a7d15945e83fb5b00afaae89091e5d..0d6b3b8312bacf61ef43da6d87ee82afd5327738 100644 (file)
--- 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 bc942b63e491e77207d0ed1f649983153e036ea6..c959758465b74ce5d1e935336dbb8ff6707202d7 100644 (file)
--- 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 5497161f136a48143e2ad28fd859473ba5cb1054..e2eea2e4b319c5966ceb83e8acf6abc3f5150ef8 100644 (file)
--- 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 b8c3db744f026f1128f27b9327fbbe3e7dad734e..dd4cb8c1396d7bf28d019c6c2bd811ee45aab70a 100644 (file)
--- 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 b900775effd6cb78cc490e599c7a87389405012b..0466d330dabcc7a9b1885ff175bc6e904b4a2378 100644 (file)
--- 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 f7e596859febfce5c4a647088da50a7cc60ed6c4..2b5453e0205d886e837ec12ee5ac996e57b8039a 100644 (file)
--- 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 f24e7060a40d63e681910f43a7853588a93e1ad1..2027a7511d4e3bb73fae13e3f81dcc3207332ac3 100644 (file)
--- 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 fafca58a0a1efe5c8fe45c8d72ec31805b29f0d3..34e4d2e5d4fb85626d95d1a2017a6d1e9d595834 100644 (file)
--- 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 36e325618dac4734247d7210daf48b0199a0eb92..b1aa1f23f4be13836970cdb4e1c68e895cc55ffa 100644 (file)
--- 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 6c5bb11cc39aeebe057b80848f216ce7e6864319..1214c2e6fa9d42499ad5af33ac16a4f7a0fe116a 100644 (file)
--- 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 ccb613014adeba44141af0e99cc411ff69de2429..abb010621c4ad791a981a7277d3664064efcc6a2 100644 (file)
--- 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 92c48c491e8b5c287d4be3efa3c03fa84426e365..6b39cab0c65cd45dcad5a4eb8ef15dce1dfece25 100644 (file)
--- 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"