diff options
| author | phk <phk@FreeBSD.org> | 2006-01-10 09:19:10 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2006-01-10 09:19:10 +0000 |
| commit | 57be8af6424fe98a84058dd0712eaa9b9e111185 (patch) | |
| tree | ba38ab39bf9faead06889887180608022ca1f910 /sys/kern/tty_pty.c | |
| parent | 102c8af8288f3384264c77b191aaff70b5806f29 (diff) | |
| download | FreeBSD-src-57be8af6424fe98a84058dd0712eaa9b9e111185.zip FreeBSD-src-57be8af6424fe98a84058dd0712eaa9b9e111185.tar.gz | |
Move the old BSD4.3 tty compatibility from (!BURN_BRIDGES && COMPAT_43)
to COMPAT_43TTY.
Add COMPAT_43TTY to NOTES and */conf/GENERIC
Compile tty_compat.c only under the new option.
Spit out
#warning "Old BSD tty API used, please upgrade."
if ioctl_compat.h gets #included from userland.
Diffstat (limited to 'sys/kern/tty_pty.c')
| -rw-r--r-- | sys/kern/tty_pty.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index e4487ef..2fdab73 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -43,11 +43,9 @@ __FBSDID("$FreeBSD$"); #include <sys/lock.h> #include <sys/mutex.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> #include <sys/tty.h> #include <sys/conf.h> @@ -553,12 +551,10 @@ ptcioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td return (EAGAIN); switch (cmd) { -#ifndef BURN_BRIDGES -#ifdef COMPAT_43 +#ifdef COMPAT_43TTY case TIOCSETP: case TIOCSETN: #endif -#endif case TIOCSETD: case TIOCSETA: case TIOCSETAW: @@ -642,8 +638,7 @@ ptsioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td case TIOCSETA: case TIOCSETAW: case TIOCSETAF: -#ifndef BURN_BRIDGES -#ifdef COMPAT_43 +#ifdef COMPAT_43TTY case TIOCSETP: case TIOCSETN: case TIOCSETC: @@ -652,7 +647,6 @@ ptsioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td case TIOCLBIC: case TIOCLSET: #endif -#endif pt->pt_send |= TIOCPKT_IOCTL; ptcwakeup(tp, FREAD); break; |
