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
diff --git a/slirp/libslirp.h b/slirp/libslirp.h
index a9260af..b46d175 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
diff --git a/vl.c b/vl.c
index d6f7e8d..7313f77 100644
--- a/vl.c
+++ b/vl.c
@@ -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)
