summaryrefslogtreecommitdiffstats
path: root/sys/kern/tty.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern/tty.c')
-rw-r--r--sys/kern/tty.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 363c31c..f5b7d91 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);
}
OpenPOWER on IntegriCloud