From patchwork Fri May 13 07:04:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 9088381 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6CB5FBF29F for ; Fri, 13 May 2016 07:06:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D170F201D3 for ; Fri, 13 May 2016 07:06:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E54F72017D for ; Fri, 13 May 2016 07:06:42 +0000 (UTC) Received: from localhost ([::1]:33000 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b17BK-0003H8-1d for patchwork-qemu-devel@patchwork.kernel.org; Fri, 13 May 2016 03:06:42 -0400 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 Received: from mx1.redhat.com ([209.132.183.28]:42591) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b179O-0003Pg-Ls; Fri, 13 May 2016 03:04:42 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 332297EBC0; Fri, 13 May 2016 07:04:42 +0000 (UTC) Received: from thh440s.fritz.box (vpn1-7-225.ams2.redhat.com [10.36.7.225]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4D74Xka010464; Fri, 13 May 2016 03:04:40 -0400 From: Thomas Huth To: Samuel Thibault , qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 13 May 2016 07:04:42 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/4] slirp: Clean up osdep.h related header inclusions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Jan Kiszka Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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)