nand emulation fixes

[qemu] / slirp / slirp.h

diff --git a/slirp/slirp.h b/slirp/slirp.h
index 7b0e968..8309fe0 100644 (file)
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -17,7 +17,7 @@
 #ifndef CONFIG_QEMU
 #include "version.h"
 #endif
-#include "config.h"
+#include "config-host.h"
 #include "slirp_config.h"
 
 #ifdef _WIN32
@@ -31,6 +31,7 @@ typedef char *caddr_t;
 
 # include <windows.h>
 # include <winsock2.h>
+# include <ws2tcpip.h>
 # include <sys/timeb.h>
 # include <iphlpapi.h>
 
@@ -101,7 +102,7 @@ typedef unsigned char u_int8_t;
 # include <sys/time.h>
 # include <time.h>
 #else
-# if HAVE_SYS_TIME_H
+# ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>
 # else
 #  include <time.h>
@@ -118,13 +119,12 @@ typedef unsigned char u_int8_t;
 #include <sys/uio.h>
 #endif
 
-#ifndef _P
+#undef _P
 #ifndef NO_PROTOTYPES
 #  define   _P(x)   x
 #else
 #  define   _P(x)   ()
 #endif
-#endif
 
 #ifndef _WIN32
 #include <netinet/in.h>
@@ -264,16 +264,6 @@ void if_start _P((struct ttys *));
 
 void lprint _P((const char *, ...));
 
-extern int do_echo;
-
-#if SIZEOF_CHAR_P == 4
-# define insque_32 insque
-# define remque_32 remque
-#else
- inline void insque_32 _P((void *, void *));
- inline void remque_32 _P((void *));
-#endif
-
 #ifndef _WIN32
 #include <netdb.h>
 #endif