qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: Samuel Thibault <samuel.thibault@ens-lyon.org>, qemu-devel@nongnu.org
Cc: Jan Kiszka <jan.kiszka@siemens.com>, qemu-trivial@nongnu.org
Subject: [Qemu-devel] [PATCH 4/4] slirp: Clean up osdep.h related header inclusions
Date: Fri, 13 May 2016 09:04:32 +0200	[thread overview]
Message-ID: <1463123072-30603-5-git-send-email-thuth@redhat.com> (raw)
In-Reply-To: <1463123072-30603-1-git-send-email-thuth@redhat.com>

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>
---
 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 <time.h>
 
 #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 <slirp.h>
-#include <qemu/osdep.h>
 #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

  parent reply	other threads:[~2016-05-13  7:04 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-13  7:04 [Qemu-devel] [PATCH 0/4] slirp: Spring-cleaning Thomas Huth
2016-05-13  7:04 ` [Qemu-devel] [PATCH 1/4] slirp: Clean up slirp_config.h Thomas Huth
2016-05-13  7:04 ` [Qemu-devel] [PATCH 2/4] slirp: Remove obsolete backward-compatibility cruft Thomas Huth
2016-05-13  7:04 ` [Qemu-devel] [PATCH 3/4] slirp: Remove some unused code from slirp.h Thomas Huth
2016-05-13  7:04 ` Thomas Huth [this message]
2016-05-13  9:42 ` [Qemu-devel] [PATCH 0/4] slirp: Spring-cleaning Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1463123072-30603-5-git-send-email-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=jan.kiszka@siemens.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=samuel.thibault@ens-lyon.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).