aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-07-12 21:11:45 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-07-12 21:11:45 +0000
commitee2654ac243748284eadd63523c65cae5bfdcf90 (patch)
tree36715e416fb348a38a39fe8fcec8f77a9add7c8c
parent354ff22657efbe48b4334bc8a77fa10faa51ca48 (diff)
removed unused includes - BSD port
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1014 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--slirp/slirp.h17
-rw-r--r--slirp/slirp_config.h8
2 files changed, 5 insertions, 20 deletions
diff --git a/slirp/slirp.h b/slirp/slirp.h
index 5b9cfdec80..eecef59165 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -121,25 +121,10 @@ int inet_aton _P((const char *cp, struct in_addr *ia));
#endif
#include <sys/socket.h>
-#if defined(WANT_SYS_IOCTL_H) && defined(HAVE_SYS_IOCTL_H)
+#if defined(HAVE_SYS_IOCTL_H)
# include <sys/ioctl.h>
-#else
-# define WANT_SYS_TERMIOS_H
-#endif
-
-#ifdef WANT_SYS_TERMIOS_H
-# ifndef INCLUDED_TERMIOS_H
-# ifdef HAVE_TERMIOS_H
-# include <termios.h>
-# else
-# include <termio.h>
-# endif
-# define INCLUDED_TERMIOS_H
-# endif
#endif
-
-
#ifdef HAVE_SYS_SELECT_H
# include <sys/select.h>
#endif
diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h
index 51fc951572..5b014f2750 100644
--- a/slirp/slirp_config.h
+++ b/slirp/slirp_config.h
@@ -61,10 +61,13 @@
#define HAVE_STDLIB_H
/* Define if you have sys/ioctl.h */
-#undef HAVE_SYS_IOCTL_H
+#define HAVE_SYS_IOCTL_H
/* Define if you have sys/filio.h */
#undef HAVE_SYS_FILIO_H
+#ifdef __APPLE__
+#define HAVE_SYS_FILIO_H
+#endif
/* Define if you have strerror */
#define HAVE_STRERROR
@@ -161,9 +164,6 @@
/* Define if you have memmove */
#define HAVE_MEMMOVE
-/* Define if you have <termios.h> */
-#undef HAVE_TERMIOS_H
-
/* Define if you have gethostid */
#undef HAVE_GETHOSTID