diff options
| author | bde <bde@FreeBSD.org> | 1997-03-24 12:03:06 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-03-24 12:03:06 +0000 |
| commit | 000a68175fce5c32b33f244fd256b37845f98d82 (patch) | |
| tree | 863884b022c2754fcd0c9423d596a97f0ef57211 /sys | |
| parent | a0d9474a34143dc9663d6ae183a89674c91bf90e (diff) | |
| download | FreeBSD-src-000a68175fce5c32b33f244fd256b37845f98d82.zip FreeBSD-src-000a68175fce5c32b33f244fd256b37845f98d82.tar.gz | |
Don't include <sys/ioctl.h> in the kernel. Stage 5: include
<sys/ioctl_compat.h> and sometimes <sys/filio.h> instead of
<sys/ioctl.h> in tty-related files. <sys/ttycom.h> is still
usually imported bogusly via <sys/termios.h>.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/si/si.c | 6 | ||||
| -rw-r--r-- | sys/i386/isa/si.c | 6 | ||||
| -rw-r--r-- | sys/kern/tty.c | 7 | ||||
| -rw-r--r-- | sys/kern/tty_compat.c | 4 | ||||
| -rw-r--r-- | sys/kern/tty_pty.c | 6 |
5 files changed, 19 insertions, 10 deletions
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index 0fa4bfb..5d8429b 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.55 1997/02/22 09:37:06 peter Exp $ + * $Id: si.c,v 1.56 1997/03/23 03:35:01 bde Exp $ */ #ifndef lint @@ -41,7 +41,9 @@ static const char si_copyright1[] = "@(#) (C) Specialix International, 1990,199 #include <sys/param.h> #include <sys/systm.h> -#include <sys/ioctl.h> +#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#include <sys/ioctl_compat.h> +#endif #include <sys/tty.h> #include <sys/ttydefaults.h> #include <sys/proc.h> diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c index 0fa4bfb..5d8429b 100644 --- a/sys/i386/isa/si.c +++ b/sys/i386/isa/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.55 1997/02/22 09:37:06 peter Exp $ + * $Id: si.c,v 1.56 1997/03/23 03:35:01 bde Exp $ */ #ifndef lint @@ -41,7 +41,9 @@ static const char si_copyright1[] = "@(#) (C) Specialix International, 1990,199 #include <sys/param.h> #include <sys/systm.h> -#include <sys/ioctl.h> +#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#include <sys/ioctl_compat.h> +#endif #include <sys/tty.h> #include <sys/ttydefaults.h> #include <sys/proc.h> diff --git a/sys/kern/tty.c b/sys/kern/tty.c index e598206..f6e14f9 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty.c 8.8 (Berkeley) 1/21/94 - * $Id: tty.c,v 1.92 1997/03/22 06:52:58 bde Exp $ + * $Id: tty.c,v 1.93 1997/03/23 03:36:26 bde Exp $ */ /*- @@ -72,7 +72,10 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/ioctl.h> +#include <sys/filio.h> +#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#include <sys/ioctl_compat.h> +#endif #include <sys/proc.h> #define TTYDEFCHARS #include <sys/tty.h> diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c index be1f27e..ed58c6a 100644 --- a/sys/kern/tty_compat.c +++ b/sys/kern/tty_compat.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_compat.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * $Id: tty_compat.c,v 1.21 1997/02/22 09:39:24 peter Exp $ */ /* @@ -41,7 +41,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/ioctl.h> +#include <sys/ioctl_compat.h> #include <sys/proc.h> #include <sys/tty.h> #include <sys/termios.h> diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index 6326fda..ee0b653 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_pty.c 8.4 (Berkeley) 2/20/95 - * $Id: tty_pty.c,v 1.41 1997/02/22 09:39:25 peter Exp $ + * $Id: tty_pty.c,v 1.42 1997/03/23 03:36:28 bde Exp $ */ /* @@ -42,7 +42,9 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/ioctl.h> +#if defined(COMPAT_43) || defined(COMPAT_SUNOS) +#include <sys/ioctl_compat.h> +#endif #include <sys/proc.h> #include <sys/tty.h> #include <sys/conf.h> |
