diff --git a/BasiliskII/src/slirp/slirp.c b/BasiliskII/src/slirp/slirp.c index 0ecb09c4..cd97e299 100755 --- a/BasiliskII/src/slirp/slirp.c +++ b/BasiliskII/src/slirp/slirp.c @@ -427,7 +427,7 @@ void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds) /* Connected */ so->so_state &= ~SS_ISFCONNECTING; - ret = send(so->s, &ret, 0, 0); + ret = send(so->s, NULL, 0, 0); if (ret < 0) { /* XXXXX Must fix, zero bytes is a NOP */ if (errno == EAGAIN || errno == EWOULDBLOCK || diff --git a/SheepShaver/src/include/ether_defs.h b/SheepShaver/src/include/ether_defs.h index 390aee4c..60468d86 100644 --- a/SheepShaver/src/include/ether_defs.h +++ b/SheepShaver/src/include/ether_defs.h @@ -525,7 +525,7 @@ union DL_primitives { struct EnetPacketHeader { uint8 fDestAddr[6]; uint8 fSourceAddr[6]; - nw_uint16 fProto; + uint16 fProto; } PACKED__; struct T8022Header { @@ -548,7 +548,7 @@ struct T8022FullPacketHeader { struct T8022AddressStruct { uint8 fHWAddr[6]; - nw_uint16 fSAP; + uint16 fSAP; uint8 fSNAP[k8022SNAPLength]; } PACKED__; diff --git a/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-execute.cpp b/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-execute.cpp index ec366e59..8e2ccac0 100644 --- a/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-execute.cpp +++ b/SheepShaver/src/kpx_cpu/src/cpu/ppc/ppc-execute.cpp @@ -90,6 +90,7 @@ static inline int ppc_to_native_rounding_mode(int round) case 2: return FE_UPWARD; case 3: return FE_DOWNWARD; } + return FE_TONEAREST; } /** diff --git a/SheepShaver/src/kpx_cpu/src/mathlib/mathlib.cpp b/SheepShaver/src/kpx_cpu/src/mathlib/mathlib.cpp index d51a8db2..dc8a8d94 100644 --- a/SheepShaver/src/kpx_cpu/src/mathlib/mathlib.cpp +++ b/SheepShaver/src/kpx_cpu/src/mathlib/mathlib.cpp @@ -88,6 +88,7 @@ int mathlib_fpclassify (double x) int mathlib_fpclassifyl(long double x) { unimplemented("fpclassifyl"); + return -1; } @@ -114,6 +115,7 @@ int mathlib_signbit (double x) int mathlib_signbitl(long double x) { unimplemented("signbitl"); + return -1; }