From d931e6ff787398e992227e0eea2da013dca6d7c8 Mon Sep 17 00:00:00 2001 From: asvitkine <> Date: Sun, 17 Jun 2012 23:15:10 +0000 Subject: [PATCH] another try to get sshpty.c compiling on bsd --- BasiliskII/src/Unix/configure.ac | 1 + BasiliskII/src/Unix/sshpty.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/BasiliskII/src/Unix/configure.ac b/BasiliskII/src/Unix/configure.ac index 078c16f5..ade33ec4 100644 --- a/BasiliskII/src/Unix/configure.ac +++ b/BasiliskII/src/Unix/configure.ac @@ -429,6 +429,7 @@ AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h, [], [], [ ]) AC_CHECK_HEADERS(AvailabilityMacros.h) AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDevice.h) +AC_CHECK_HEADERS(sys/stropts.h stropts.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_BIGENDIAN diff --git a/BasiliskII/src/Unix/sshpty.c b/BasiliskII/src/Unix/sshpty.c index 6cc3ae91..48e69dc7 100644 --- a/BasiliskII/src/Unix/sshpty.c +++ b/BasiliskII/src/Unix/sshpty.c @@ -88,6 +88,9 @@ RCSID("$OpenBSD: sshpty.c,v 1.4 2001/12/19 07:18:56 deraadt Exp $"); #if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H) # include #endif +#if defined(HAVE_DEV_PTMX) && defined(HAVE_STROPTS_H) +# include +#endif #ifndef O_NOCTTY #define O_NOCTTY 0 @@ -179,7 +182,7 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen) close(*ptyfd); return 0; } -#if !defined(HAVE_CYGWIN) && !defined(__FreeBSD__) +#ifndef HAVE_CYGWIN /* * Push the appropriate streams modules, as described in Solaris pts(7). * HP-UX pts(7) doesn't have ttcompat module.