Commit 9892663d authored May 13, 2016 by Thomas Huth Committed by Samuel Thibault May 16, 2016

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>

parent 2cdc848e

slirp/ip6_icmp.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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)

slirp/ip_input.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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);

slirp/udp6.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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)