diff --git a/bin/stty/print.c b/bin/stty/print.c index cf24d4f46529..30fcbaa1446a 100644 --- a/bin/stty/print.c +++ b/bin/stty/print.c @@ -44,8 +44,6 @@ __FBSDID("$FreeBSD$"); #include "stty.h" #include "extern.h" -#include /* XXX NTTYDISC is too well hidden */ - static void binit(const char *); static void bput(const char *); static const char *ccval(struct cchar *, int); @@ -64,9 +62,6 @@ print(struct termios *tp, struct winsize *wp, int ldisc, enum FMT fmt) /* Line discipline. */ if (ldisc != TTYDISC) { switch(ldisc) { - case NTTYDISC: - cnt += printf("new tty disc; "); - break; case SLIPDISC: cnt += printf("slip disc; "); break; diff --git a/sys/sys/ioctl_compat.h b/sys/sys/ioctl_compat.h index 9be7dd2a757e..6399badf2102 100644 --- a/sys/sys/ioctl_compat.h +++ b/sys/sys/ioctl_compat.h @@ -61,8 +61,6 @@ struct ltchars { /* * Structure for TIOCGETP and TIOCSETP ioctls. */ -#ifndef _SGTTYB_ -#define _SGTTYB_ struct sgttyb { char sg_ispeed; /* input speed */ char sg_ospeed; /* output speed */ @@ -70,7 +68,6 @@ struct sgttyb { char sg_kill; /* kill character */ short sg_flags; /* mode flags */ }; -#endif #define OTIOCGETD _IOR('t', 0, int) /* get line discipline */ #define OTIOCSETD _IOW('t', 1, int) /* set line discipline */ @@ -152,9 +149,4 @@ struct sgttyb { #endif /* _KERNEL */ -/* XXX publish these so stty(1) can still report them */ -#define OTTYDISC 0 -#define NETLDISC 1 -#define NTTYDISC 2 - #endif /* !_SYS_IOCTL_COMPAT_H_ */ diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index b3e55a89c26c..a15292b78ef2 100644 --- a/usr.sbin/pstat/pstat.c +++ b/usr.sbin/pstat/pstat.c @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include /* XXX NTTYDISC is too well hidden */ #include #include @@ -367,9 +366,6 @@ ttyprt(struct xtty *xt) case TTYDISC: (void)printf("term\n"); break; - case NTTYDISC: - (void)printf("ntty\n"); - break; case SLIPDISC: (void)printf("slip\n"); break;