From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b179R-0008FZ-FE for qemu-devel@nongnu.org; Fri, 13 May 2016 03:04:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b179O-0003QV-SI for qemu-devel@nongnu.org; Fri, 13 May 2016 03:04:44 -0400 From: Thomas Huth Date: Fri, 13 May 2016 09:04:32 +0200 Message-Id: <1463123072-30603-5-git-send-email-thuth@redhat.com> In-Reply-To: <1463123072-30603-1-git-send-email-thuth@redhat.com> References: <1463123072-30603-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] slirp: Clean up osdep.h related header inclusions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Samuel Thibault , qemu-devel@nongnu.org Cc: Jan Kiszka , qemu-trivial@nongnu.org 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 --- 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) -- 1.8.3.1