diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1996-11-21 07:59:41 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1996-11-21 07:59:41 +0000 |
| commit | e7ba2dde1be71475ca9e13475a5da793e6e71492 (patch) | |
| tree | 92fc7d77b93be740bc71187341a0164e93242b61 /bin/pdksh/tty.h | |
| parent | 348b1798b3067a1b3e79d9460d7f51a07ccd44ef (diff) | |
Update to 5.2.12.
Diffstat (limited to 'bin/pdksh/tty.h')
| -rw-r--r-- | bin/pdksh/tty.h | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/bin/pdksh/tty.h b/bin/pdksh/tty.h index 3982fa9752d..a6cd2dae1e9 100644 --- a/bin/pdksh/tty.h +++ b/bin/pdksh/tty.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.h,v 1.1 1996/08/14 06:19:12 downsj Exp $ */ +/* $OpenBSD: tty.h,v 1.2 1996/11/21 07:59:36 downsj Exp $ */ /* tty.h -- centralized definitions for a variety of terminal interfaces @@ -20,12 +20,34 @@ # define EXTERN_DEFINED #endif +/* Don't know of a system on which including sys/ioctl.h with termios.h + * causes problems. If there is one, these lines need to be deleted and + * aclocal.m4 needs to have stuff un-commented. + */ +#ifdef SYS_IOCTL_WITH_TERMIOS +# define SYS_IOCTL_WITH_TERMIOS +#endif /* SYS_IOCTL_WITH_TERMIOS */ +#ifdef SYS_IOCTL_WITH_TERMIO +# define SYS_IOCTL_WITH_TERMIO +#endif /* SYS_IOCTL_WITH_TERMIO */ + #ifdef HAVE_TERMIOS_H # include <termios.h> +# ifdef SYS_IOCTL_WITH_TERMIOS +# if !(defined(sun) && !defined(__svr4__)) /* too many warnings on sunos */ + /* Need to include sys/ioctl.h on some systems to get the TIOCGWINSZ + * stuff (eg, digital unix). + */ +# include <sys/ioctl.h> +# endif /* !(sun && !__svr4__) */ +# endif /* SYS_IOCTL_WITH_TERMIOS */ typedef struct termios TTY_state; #else # ifdef HAVE_TERMIO_H # include <termio.h> +# ifdef SYS_IOCTL_WITH_TERMIO +# include <sys/ioctl.h> /* see comment above in termios stuff */ +# endif /* SYS_IOCTL_WITH_TERMIO */ # if _BSD_SYSV /* BRL UNIX System V emulation */ # ifndef NTTYDISC # define TIOCGETD _IOR( 't', 0, int ) |