Merge remote-tracking branch 'mcayland/qemu-openbios' into staging

[qemu.git] / slirp / slirp_config.h

diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h
index 51fc9515726bdd4a7beee8a393c07fc95bbf854e..18db45c8e42eb57d84bf47991890c36fc913975e 100644 (file)
--- a/slirp/slirp_config.h
+++ b/slirp/slirp_config.h
@@ -2,9 +2,6 @@
  * User definable configuration options
  */
 
-/* Undefine if you don't want talk emulation */
-#undef EMULATE_TALK
-
 /* Define if you want the connection to be probed */
 /* XXX Not working yet, so ignore this for now */
 #undef PROBE_CONN
@@ -62,9 +59,15 @@
 
 /* Define if you have sys/ioctl.h */
 #undef HAVE_SYS_IOCTL_H
+#ifndef _WIN32
+#define HAVE_SYS_IOCTL_H
+#endif
 
 /* 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
@@ -80,31 +83,34 @@
 #undef HAVE_SYS_BITYPES_H
 
 /* Define if the machine is big endian */
-//#undef WORDS_BIGENDIAN
-
-/* Define if your sprintf returns char * instead of int */
-#undef BAD_SPRINTF
+//#undef HOST_WORDS_BIGENDIAN
 
 /* Define if you have readv */
 #undef HAVE_READV
 
 /* Define if iovec needs to be declared */
 #undef DECLARE_IOVEC
-
-/* Define if a declaration of sprintf/fprintf is needed */
-#undef DECLARE_SPRINTF
+#ifdef _WIN32
+#define DECLARE_IOVEC
+#endif
 
 /* Define if you have a POSIX.1 sys/wait.h */
 #undef HAVE_SYS_WAIT_H
 
 /* Define if you have sys/select.h */
+#undef HAVE_SYS_SELECT_H
+#ifndef _WIN32
 #define HAVE_SYS_SELECT_H
+#endif
 
 /* Define if you have strings.h */
 #define HAVE_STRING_H
 
 /* Define if you have arpa/inet.h */
+#undef HAVE_ARPA_INET_H
+#ifndef _WIN32
 #define HAVE_ARPA_INET_H
+#endif
 
 /* Define if you have sys/signal.h */
 #undef HAVE_SYS_SIGNAL_H
@@ -113,17 +119,14 @@
 #undef HAVE_SYS_STROPTS_H
 
 /* Define to whatever your compiler thinks inline should be */
-#define inline inline
+//#define inline inline
 
 /* Define to whatever your compiler thinks const should be */
-#define const const
+//#define const const
 
 /* Define if your compiler doesn't like prototypes */
 #undef NO_PROTOTYPES
 
-/* Define if you don't have u_int32_t etc. typedef'd */
-#undef NEED_TYPEDEFS
-
 /* Define to sizeof(char) */
 #define SIZEOF_CHAR 1
 
@@ -134,8 +137,7 @@
 #define SIZEOF_INT 4
 
 /* Define to sizeof(char *) */
-/* XXX: patch it */
-#define SIZEOF_CHAR_P 4
+#define SIZEOF_CHAR_P (HOST_LONG_BITS / 8)
 
 /* Define if you have random() */
 #undef HAVE_RANDOM
@@ -144,13 +146,16 @@
 #undef HAVE_SRANDOM
 
 /* Define if you have inet_aton */
+#undef HAVE_INET_ATON
+#ifndef _WIN32
 #define HAVE_INET_ATON
+#endif
 
 /* Define if you have setenv */
 #undef HAVE_SETENV
 
 /* Define if you have index() */
-#undef HAVE_INDEX
+#define HAVE_INDEX
 
 /* Define if you have bcmp() */
 #undef HAVE_BCMP
@@ -161,17 +166,14 @@
 /* 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
+#define HAVE_GETHOSTID
 
 /* Define if you DON'T have unix-domain sockets */
 #undef NO_UNIX_SOCKETS
-
-/* Define if gettimeofday only takes one argument */
-#undef GETTIMEOFDAY_ONE_ARG
+#ifdef _WIN32
+#define NO_UNIX_SOCKETS
+#endif
 
 /* Define if you have revoke() */
 #undef HAVE_REVOKE