diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2006-01-10 09:19:10 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2006-01-10 09:19:10 +0000 |
| commit | d3e64681d60b8727fc13f25607d5991a7e359837 (patch) | |
| tree | ba38ab39bf9faead06889887180608022ca1f910 /sys/kern/tty.c | |
| parent | c02b454debff2b332ee352b77f991e5514ff288f (diff) | |
Notes
Diffstat (limited to 'sys/kern/tty.c')
| -rw-r--r-- | sys/kern/tty.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 363c31c37b3e..f5b7d91f4d71 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -83,11 +83,9 @@ __FBSDID("$FreeBSD$"); #include <sys/mutex.h> #include <sys/namei.h> #include <sys/sx.h> -#ifndef BURN_BRIDGES -#if defined(COMPAT_43) +#if defined(COMPAT_43TTY) #include <sys/ioctl_compat.h> #endif -#endif #include <sys/proc.h> #define TTYDEFCHARS #include <sys/tty.h> @@ -828,8 +826,7 @@ ttioctl(struct tty *tp, u_long cmd, void *data, int flag) case TIOCSTI: case TIOCSTOP: case TIOCSWINSZ: -#ifndef BURN_BRIDGES -#if defined(COMPAT_43) +#if defined(COMPAT_43TTY) case TIOCLBIC: case TIOCLBIS: case TIOCLSET: @@ -839,7 +836,6 @@ ttioctl(struct tty *tp, u_long cmd, void *data, int flag) case TIOCSETP: case TIOCSLTC: #endif -#endif sx_slock(&proctree_lock); PROC_LOCK(p); while (isbackground(p, tp) && !(p->p_flag & P_PPWAIT) && @@ -1255,15 +1251,11 @@ ttioctl(struct tty *tp, u_long cmd, void *data, int flag) case TIOCCBRK: return (tt_break(tp, 0)); default: -#if defined(COMPAT_43) -#ifndef BURN_BRIDGES +#if defined(COMPAT_43TTY) return (ttcompat(tp, cmd, data, flag)); #else return (ENOIOCTL); #endif -#else - return (ENOIOCTL); -#endif } return (0); } |