- added IRIX patches from Brian Johnson

- the existence of socklen_t is now checked by the configure script

BasiliskII/src/Unix/acconfig.h

@@ -17,6 +17,9 @@
 /* Define to 'off_t' if <sys/types.h> doesn't define. */
 #undef loff_t
 
+/* Define to 'int' if <sys/types.h> doesn't define. */
+#undef socklen_t
+
 /* Define if using ESD. */
 #undef ENABLE_ESD
 

BasiliskII/src/Unix/aclocal.m4

@@ -407,3 +407,19 @@ else
   $1_FALSE=
 fi])
 
+dnl Check for socklen_t type
+
+AC_DEFUN(TYPE_SOCKLEN_T,
+[AC_REQUIRE([AC_HEADER_STDC])dnl
+AC_MSG_CHECKING(for socklen_t)
+AC_CACHE_VAL(ac_cv_type_socklen_t,
+[AC_EGREP_CPP(dnl
+changequote(<<,>>)dnl
+<<(^|[^a-zA-Z_0-9])socklen_t[^a-zA-Z_0-9]>>dnl
+changequote([,]), [#include <sys/types.h>
+#include <sys/socket.h>], ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no)])dnl
+AC_MSG_RESULT($ac_cv_type_socklen_t)
+if test $ac_cv_type_socklen_t = no; then
+  AC_DEFINE(socklen_t, int)
+fi
+])

BasiliskII/src/Unix/configure.in

@@ -206,6 +206,7 @@ AC_CHECK_SIZEOF(long long, 8)
 AC_CHECK_SIZEOF(void *, 4)
 AC_TYPE_OFF_T
 AC_CHECK_TYPE(loff_t, off_t)
+TYPE_SOCKLEN_T
 AC_TYPE_SIZE_T
 AC_TYPE_SIGNAL
 AC_HEADER_TIME
@@ -265,11 +266,13 @@ solaris*)
   DEFINES="$DEFINES -DBSD_COMP -D_POSIX_PTHREAD_SEMANTICS"
   ;;
 irix*)
+  ETHERSRC=ether_unix.cpp
   AUDIOSRC=Irix/audio_irix.cpp
   EXTRASYSSRCS=Irix/unaligned.c
   dnl IRIX headers work fine, but somehow don't define or use "STDC_HEADERS"
   DEFINES="$DEFINES -DCRTSCTS=CNEW_RTSCTS -DB230400=B115200 -DSTDC_HEADERS"
   LIBS="$LIBS -laudio"
+  WANT_ESD=no
 
   dnl Check if our compiler supports -Ofast (MIPSPro)
   HAVE_OFAST=no

BasiliskII/src/Unix/ether_unix.cpp

@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <map>
 
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(sgi)
 #include <net/if.h>
 #endif