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>.
This commit is contained in:
Bruce Evans 1997-03-24 12:03:06 +00:00
parent 2098241054
commit afd2f6c218
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=24207
5 changed files with 19 additions and 10 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>