From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2O92-0007G8-79 for qemu-devel@nongnu.org; Mon, 16 May 2016 15:25:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2O8r-0004O3-9X for qemu-devel@nongnu.org; Mon, 16 May 2016 15:25:36 -0400 Received: from hera.aquilenet.fr ([141.255.128.1]:54443) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2O8r-0004Mj-2i for qemu-devel@nongnu.org; Mon, 16 May 2016 15:25:25 -0400 From: Samuel Thibault Date: Mon, 16 May 2016 21:25:20 +0200 Message-Id: <1463426720-25008-5-git-send-email-samuel.thibault@ens-lyon.org> In-Reply-To: <1463426720-25008-1-git-send-email-samuel.thibault@ens-lyon.org> References: <1463426720-25008-1-git-send-email-samuel.thibault@ens-lyon.org> Subject: [Qemu-devel] [PULL 4/4] slirp: Clean up osdep.h related header inclusions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: Thomas Huth , jan.kiszka@siemens.com, Samuel Thibault From: Thomas Huth 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 Reviewed-by: Peter Maydell Signed-off-by: Samuel Thibault --- slirp/ip6_icmp.c | 1 - slirp/ip_input.c | 1 - slirp/udp6.c | 1 - 3 files changed, 3 deletions(-) diff --git a/slirp/ip6_icmp.c b/slirp/ip6_icmp.c index 09571bc..48016a9 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 #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 cdd5483..34fba2b 100644 --- a/slirp/ip_input.c +++ b/slirp/ip_input.c @@ -40,7 +40,6 @@ #include "qemu/osdep.h" #include -#include #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 a23026f..94efb13 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) -- 2.8.1