mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added check for type ssize_t

Browse Source 
List the supported ethernet modules
This commit is contained in:
Volker Ruppert 2013-12-04 17:04:15 +00:00
parent a5153c348f
commit fb70da3e3e
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bochs/config.h.in
View File

@ -137,6 +137,7 @@
#define BX_HAVE_NET_IF_H 0
#define BX_HAVE___BUILTIN_BSWAP32 0
#define BX_HAVE___BUILTIN_BSWAP64 0
#define BX_HAVE_SSIZE_T 0
// This turns on Roland Mainz's idle hack. Presently it is specific to the X11
// and term gui. If people try to enable it elsewhere, give a compile error

12
bochs/configure.in
View File

@ -186,6 +186,7 @@ if test "$MSVC_TARGET" != 1; then
AC_CHECK_FUNCS(tmpfile64, AC_DEFINE(BX_HAVE_TMPFILE64))
AC_CHECK_FUNCS(fseek64, AC_DEFINE(BX_HAVE_FSEEK64))
AC_CHECK_FUNCS(fseeko64, AC_DEFINE(BX_HAVE_FSEEKO64))
AC_CHECK_TYPE(ssize_t, AC_DEFINE(BX_HAVE_SSIZE_T), , [#include <sys/types.h>])
else
AC_DEFINE(BX_HAVE_SELECT, 1)
AC_DEFINE(BX_HAVE_SOCKLEN_T, 0)
@ -204,6 +205,7 @@ else
AC_DEFINE(BX_HAVE_TMPFILE64, 0)
AC_DEFINE(BX_HAVE_FSEEK64, 0)
AC_DEFINE(BX_HAVE_FSEEKO64, 0)
AC_DEFINE(BX_HAVE_SSIZE_T, 0)
fi
AC_CHECK_FUNCS(sleep, AC_DEFINE(BX_HAVE_SLEEP))
AC_CHECK_FUNCS(nanosleep, AC_DEFINE(BX_HAVE_NANOSLEEP))
@ -852,13 +854,16 @@ AC_ARG_ENABLE(e1000,
NETLOW_OBJS=''
if test "$networking" = yes; then
NETLOW_OBJS='eth_null.o eth_vnet.o'
ethernet_modules='null vnet'
if test "$MSVC_TARGET" != 1; then
AC_CHECK_HEADER(net/bpf.h, [
NETLOW_OBJS="$NETLOW_OBJS eth_fbsd.o"
ethernet_modules="$ethernet_modules fbsd"
AC_DEFINE(BX_NETMOD_FBSD, 1)
])
AC_CHECK_HEADER(netpacket/packet.h, [
NETLOW_OBJS="$NETLOW_OBJS eth_linux.o"
ethernet_modules="$ethernet_modules linux"
AC_DEFINE(BX_NETMOD_LINUX, 1)
])
AC_CHECK_FUNCS(fork, have_fork=1)
@ -866,16 +871,19 @@ if test "$networking" = yes; then
AC_CHECK_FUNCS(socketpair, have_socketpair=1)
if test x"$have_fork" = x1 -a x"$have_execlp" = x1 -a x"$have_socketpair" = x1; then
NETLOW_OBJS="$NETLOW_OBJS eth_slirp.o"
ethernet_modules="$ethernet_modules slirp"
AC_DEFINE(BX_NETMOD_SLIRP, 1)
fi
fi
case "$target" in
*-pc-windows* | *-pc-winnt* | *-cygwin* | *-mingw32*)
NETLOW_OBJS="$NETLOW_OBJS eth_win32.o"
ethernet_modules="$ethernet_modules win32"
AC_DEFINE(BX_NETMOD_WIN32, 1)
;;
*-macosx* | *-darwin*)
NETLOW_OBJS="$NETLOW_OBJS eth_tuntap.o"
ethernet_modules="$ethernet_modules tuntap"
AC_DEFINE(BX_NETMOD_TUNTAP, 1)
;;
*)
@ -897,6 +905,7 @@ if test "$networking" = yes; then
if test "$use_ethertap" = yes; then
NETLOW_OBJS="$NETLOW_OBJS eth_tap.o eth_vde.o"
ethernet_modules="$ethernet_modules tap vde"
AC_DEFINE(BX_NETMOD_TAP, 1)
AC_DEFINE(BX_NETMOD_VDE, 1)
fi
@ -918,6 +927,7 @@ if test "$networking" = yes; then
])
if test "$use_tuntap" = yes; then
NETLOW_OBJS="$NETLOW_OBJS eth_tuntap.o"
ethernet_modules="$ethernet_modules tuntap"
AC_DEFINE(BX_NETMOD_TUNTAP, 1)
fi
@ -928,6 +938,8 @@ if test "$networking" = yes; then
AC_SUBST(NETWORK_LIB_VAR)
fi
AC_DEFINE(BX_NETWORKING, 1)
AC_MSG_CHECKING(for ethernet modules)
AC_MSG_RESULT($ethernet_modules)
else
AC_DEFINE(BX_NETWORKING, 0)
fi

8
bochs/osdep.h
View File

@ -43,9 +43,6 @@ extern "C" {
//////////////////////////////////////////////////////////////////////
#ifdef WIN32
// Definitions that are needed for all WIN32 compilers.
# define ssize_t long
#ifndef __MINGW32__
// Definitions that are needed for WIN32 compilers EXCEPT FOR
@ -201,6 +198,11 @@ extern "C" {
typedef int socklen_t;
#endif
#if !BX_HAVE_SSIZE_T
// needed on Windows
typedef Bit64s ssize_t;
#endif
#if !BX_HAVE_MKSTEMP
#define mkstemp bx_mkstemp
BOCHSAPI_MSVCONLY extern int bx_mkstemp(char *tpl);