aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2016-05-13 09:04:32 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-05-16 21:01:16 +0200
commit9892663dc486755b5534ff8a77913edc5ea28c79 (patch)
tree864e3365ebfca703e16e62e83ce2acce911618a9
parent2cdc848eb5bd7caf467942aee63f813f52db4e40 (diff)
slirp: Clean up osdep.h related header inclusions
qemu/osdep.h is included in some headers twice - one time should be sufficient. Also remove the inclusion of time.h since that is already done by osdep.h, too (this makes scripts/clean-includes happy again). Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
-rw-r--r--slirp/ip6_icmp.c1
-rw-r--r--slirp/ip_input.c1
-rw-r--r--slirp/udp6.c1
3 files changed, 0 insertions, 3 deletions
diff --git a/slirp/ip6_icmp.c b/slirp/ip6_icmp.c
index 09571bcd6b..48016a9f85 100644
--- a/slirp/ip6_icmp.c
+++ b/slirp/ip6_icmp.c
@@ -9,7 +9,6 @@
#include "qemu/timer.h"
#include "qemu/error-report.h"
#include "qemu/log.h"
-#include <time.h>
#define NDP_Interval g_rand_int_range(slirp->grand, \
NDP_MinRtrAdvInterval, NDP_MaxRtrAdvInterval)
diff --git a/slirp/ip_input.c b/slirp/ip_input.c
index cdd54833a3..34fba2b7dd 100644
--- a/slirp/ip_input.c
+++ b/slirp/ip_input.c
@@ -40,7 +40,6 @@
#include "qemu/osdep.h"
#include <slirp.h>
-#include <qemu/osdep.h>
#include "ip_icmp.h"
static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp);
diff --git a/slirp/udp6.c b/slirp/udp6.c
index a23026f2e4..94efb13240 100644
--- a/slirp/udp6.c
+++ b/slirp/udp6.c
@@ -6,7 +6,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "slirp.h"
-#include "qemu/osdep.h"
#include "udp.h"
void udp6_input(struct mbuf *m)