summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-02-23 14:18:29 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-03-16 12:48:11 +0000
commit4674da1c49d07e5159775cd731f947c9fe2f3b83 (patch)
treee7aea6d19d03650329181137d0eddf85754e357c
parent6aeda86890a6c36e0538004e378cb647b51035f0 (diff)
downloadfocaccia-qemu-4674da1c49d07e5159775cd731f947c9fe2f3b83.tar.gz
focaccia-qemu-4674da1c49d07e5159775cd731f947c9fe2f3b83.zip
slirp/slirp.h: Remove now-empty #ifdefs
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>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 1456237112-32662-2-git-send-email-peter.maydell@linaro.org
-rw-r--r--slirp/slirp.h24
1 files changed, 0 insertions, 24 deletions
diff --git a/slirp/slirp.h b/slirp/slirp.h
index 71f2439461..9ad88e7df7 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -24,28 +24,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
@@ -96,12 +78,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