summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure3
-rw-r--r--configure.in2
-rw-r--r--h/config.h.in3
-rw-r--r--h/sysdep.h15
-rw-r--r--zwgc/tty_filter.c6
5 files changed, 3 insertions, 26 deletions
diff --git a/configure b/configure
index d126bea..9c9c849 100755
--- a/configure
+++ b/configure
@@ -21092,8 +21092,7 @@ fi
-
-for ac_header in fcntl.h paths.h termios.h sgtty.h unistd.h malloc.h term.h
+for ac_header in fcntl.h paths.h sgtty.h unistd.h malloc.h term.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
diff --git a/configure.in b/configure.in
index b84452f..3097907 100644
--- a/configure.in
+++ b/configure.in
@@ -36,7 +36,7 @@ dnl Checks for header files.
AC_PATH_XTRA
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h paths.h termios.h sgtty.h unistd.h malloc.h term.h)
+AC_CHECK_HEADERS(fcntl.h paths.h sgtty.h unistd.h malloc.h term.h)
AC_CHECK_HEADERS(sys/filio.h sys/ioctl.h sys/time.h sys/file.h sys/utsname.h)
AC_CHECK_HEADERS(sys/select.h sys/msgbuf.h sys/cdefs.h krb5_err.h termcap.h)
AC_CHECK_HEADERS(arpa/nameser_compat.h)
diff --git a/h/config.h.in b/h/config.h.in
index 327936c..074306f 100644
--- a/h/config.h.in
+++ b/h/config.h.in
@@ -233,9 +233,6 @@
/* Define to 1 if you have the <termcap.h> header file. */
#undef HAVE_TERMCAP_H
-/* Define to 1 if you have the <termios.h> header file. */
-#undef HAVE_TERMIOS_H
-
/* Define to 1 if you have the <term.h> header file. */
#undef HAVE_TERM_H
diff --git a/h/sysdep.h b/h/sysdep.h
index 468e5c4..f6943ba 100644
--- a/h/sysdep.h
+++ b/h/sysdep.h
@@ -152,20 +152,7 @@ ZEPHYR_INT32 gethostid();
#define STDERR_FILENO 2
#endif
-#ifdef HAVE_TERMIOS_H
-# include <termios.h>
-#else
-# ifdef HAVE_SYS_FILIO_H
-# include <sys/filio.h>
-# else
-# ifdef HAVE_SGTTY_H
-# include <sgtty.h>
-# endif
-# ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
-# endif
-# endif
-#endif
+#include <termios.h>
/* Kerberos compatibility. */
#ifdef HAVE_KRB4
diff --git a/zwgc/tty_filter.c b/zwgc/tty_filter.c
index 97905e3..81f2365 100644
--- a/zwgc/tty_filter.c
+++ b/zwgc/tty_filter.c
@@ -102,15 +102,9 @@ tty_filter_init(char *drivername,
int ex;
string_dictionary_binding *b;
int isrealtty = string_Eq(drivername, "tty");
-#ifdef HAVE_TERMIOS_H
struct termios tbuf;
ospeed = (tcgetattr(STDIN_FILENO, &tbuf) == 0) ? cfgetospeed(&tbuf) : 2400;
-#else
- struct sgttyb sgttyb;
-
- ospeed = (ioctl(0, TIOCGETP, &sgttyb) == 0) ? sgttyb.sg_ospeed : 2400;
-#endif
if (termcap_dict == (string_dictionary) NULL)
termcap_dict = string_dictionary_Create(7);