From patchwork Mon May 16 19:25:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 9105531 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 484FCBF29F for ; Mon, 16 May 2016 19:27:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D191200E9 for ; Mon, 16 May 2016 19:27:27 +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 DA292200CF for ; Mon, 16 May 2016 19:27:26 +0000 (UTC) Received: from localhost ([::1]:46958 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2OAo-0002hq-1U for patchwork-qemu-devel@patchwork.kernel.org; Mon, 16 May 2016 15:27:26 -0400 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 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 40FD2852B; Mon, 16 May 2016 21:25:21 +0200 (CEST) Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id soGnzlQE4ndo; Mon, 16 May 2016 21:25:21 +0200 (CEST) Received: from var.youpi.perso.aquilenet.fr (unknown [IPv6:2a01:cb19:1ba:5d00:3602:86ff:fe2c:6a19]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 335318659; Mon, 16 May 2016 21:25:20 +0200 (CEST) Received: from samy by var.youpi.perso.aquilenet.fr with local (Exim 4.87) (envelope-from ) id 1b2O8m-0006WC-Nj; Mon, 16 May 2016 21:25:20 +0200 From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Mon, 16 May 2016 21:25:20 +0200 Message-Id: <1463426720-25008-5-git-send-email-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.8.1 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> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 141.255.128.1 Subject: [Qemu-devel] [PULL 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: jan.kiszka@siemens.com, Thomas Huth , Samuel Thibault 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 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)