qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Cc: patches@linaro.org
Subject: [Qemu-devel] [PATCH 1/4] slirp/slirp.h: Remove now-empty #ifdefs
Date: Tue, 23 Feb 2016 14:18:29 +0000	[thread overview]
Message-ID: <1456237112-32662-2-git-send-email-peter.maydell@linaro.org> (raw)
In-Reply-To: <1456237112-32662-1-git-send-email-peter.maydell@linaro.org>

After automatic cleanup to remove unnecessary #includes of headers that
osdep.h provides, slirp.h has a few now unnecessary #ifdef/#endif pairs;
remove them.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 slirp/slirp.h | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/slirp/slirp.h b/slirp/slirp.h
index 07c13b4..7cfcf63 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -26,28 +26,10 @@ typedef char *caddr_t;
 #endif
 
 
-#ifdef HAVE_UNISTD_H
-#endif
-
-#ifdef HAVE_STDLIB_H
-#endif
-
-
 #ifndef HAVE_MEMMOVE
 #define memmove(x, y, z) bcopy(y, x, z)
 #endif
 
-#if TIME_WITH_SYS_TIME
-#else
-# ifdef HAVE_SYS_TIME_H
-# else
-# endif
-#endif
-
-#ifdef HAVE_STRING_H
-#else
-#endif
-
 #ifndef _WIN32
 #include <sys/uio.h>
 #endif
@@ -98,12 +80,6 @@ void free(void *ptr);
 #include <ppp/slirppp.h>
 #endif
 
-#ifdef __STDC__
-#else
-#include <varargs.h>
-#endif
-
-
 /* Avoid conflicting with the libc insque() and remque(), which
    have different prototypes. */
 #define insque slirp_insque
-- 
1.9.1

  reply	other threads:[~2016-02-23 14:18 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-23 14:18 [Qemu-devel] [PATCH 0/4] post-include-cleanup followups Peter Maydell
2016-02-23 14:18 ` Peter Maydell [this message]
2016-02-23 15:04   ` [Qemu-devel] [PATCH 1/4] slirp/slirp.h: Remove now-empty #ifdefs Eric Blake
2016-02-24 18:58   ` Thomas Huth
2016-02-24 22:23     ` Peter Maydell
2016-02-23 14:18 ` [Qemu-devel] [PATCH 2/4] include/config.h: Remove Peter Maydell
2016-02-23 14:18 ` [Qemu-devel] [PATCH 3/4] update-linux-headers.sh: Fake types.h doesn't need to include anything Peter Maydell
2016-02-23 14:18 ` [Qemu-devel] [PATCH 4/4] util/base64.c: Clean includes Peter Maydell
2016-02-23 15:05 ` [Qemu-devel] [PATCH 0/4] post-include-cleanup followups Eric Blake
2016-03-16 12:49 ` 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=1456237112-32662-2-git-send-email-peter.maydell@linaro.org \
    --to=peter.maydell@linaro.org \
    --cc=patches@linaro.org \
    --cc=qemu-devel@nongnu.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).