diff options
| author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-09-13 12:39:35 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-09-13 12:39:35 +0000 |
| commit | cb4b976b82749b29ca6731d47e3a3237b32f9497 (patch) | |
| tree | 0226fce041eb5a9749f5c9f24b6ef2b6688dd690 | |
| parent | 8c05dbf9b68cc8444573116063582e01a0442b0b (diff) | |
| download | qemu-cb4b976b82749b29ca6731d47e3a3237b32f9497.tar.gz | |
Move network related includes to vl.c to help SLIRP-less builds.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3167 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | slirp/libslirp.h | 8 | ||||
| -rw-r--r-- | vl.c | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/slirp/libslirp.h b/slirp/libslirp.h index a9260afeb3..b46d1758e0 100644 --- a/slirp/libslirp.h +++ b/slirp/libslirp.h @@ -1,14 +1,6 @@ #ifndef _LIBSLIRP_H #define _LIBSLIRP_H -#ifdef _WIN32 -#include <winsock2.h> -int inet_aton(const char *cp, struct in_addr *ia); -#else -#include <sys/select.h> -#include <arpa/inet.h> -#endif - #ifdef __cplusplus extern "C" { #endif @@ -42,6 +42,8 @@ #include <netinet/in.h> #include <dirent.h> #include <netdb.h> +#include <sys/select.h> +#include <arpa/inet.h> #ifdef _BSD #include <sys/stat.h> #ifndef __APPLE__ @@ -63,7 +65,6 @@ #include <sys/stat.h> #include <sys/ethernet.h> #include <sys/sockio.h> -#include <arpa/inet.h> #include <netinet/arp.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -76,6 +77,9 @@ #include <stropts.h> #endif #endif +#else +#include <winsock2.h> +int inet_aton(const char *cp, struct in_addr *ia); #endif #if defined(CONFIG_SLIRP) |