diff options
| author | bde <bde@FreeBSD.org> | 1996-09-21 14:59:43 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1996-09-21 14:59:43 +0000 |
| commit | 9bcb122232e4319fd67ee59c7cd43611d5e2fc60 (patch) | |
| tree | e03f53db0e9dc53fdad8b0a593af598744be17da /sys/sys/cdio.h | |
| parent | 178a446971cddf750d684ed6f842b14faed1c64e (diff) | |
| download | FreeBSD-src-9bcb122232e4319fd67ee59c7cd43611d5e2fc60.zip FreeBSD-src-9bcb122232e4319fd67ee59c7cd43611d5e2fc60.tar.gz | |
Cleaned up all headers that include <sys/ioctl.h> or <sys/ioccom.h>:
- don't include <sys/ioctl.h> in any header. Include <sys/ioccom.h>
instead. This was already done in 4.4Lite for the most important
ioctl headers. Header spam currently increases kernel build
times by 10-20%. There are more than 30000 #includes (not counting
duplicates) for compiling LINT.
- include <sys/types.h> if and only it is necessary to make the header
almost self-sufficient (some ioctl headers still need structs from
elsewhere).
- uniformized idempotency ifdefs. Copied the style in the 4.4Lite
ioctl headers.
Diffstat (limited to 'sys/sys/cdio.h')
| -rw-r--r-- | sys/sys/cdio.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h index 8019130..564ab66 100644 --- a/sys/sys/cdio.h +++ b/sys/sys/cdio.h @@ -1,8 +1,9 @@ /* * 16 Feb 93 Julian Elischer (julian@dialix.oz.au) * - * $Id: cdio.h,v 1.12 1996/02/02 20:41:11 ache Exp $ + * $Id: cdio.h,v 1.13 1996/02/03 14:19:13 ache Exp $ */ + /* <1> Fixed a conflict with ioctl usage. There were two different functions using code #25. Made file formatting consistent. @@ -20,10 +21,15 @@ 2-Apr-95 Frank Durda IV bsdmail@nemesis.lonestar.org */ - /* Shared between kernel & process */ -#ifndef _SYS_CDIO_H_ -#define _SYS_CDIO_H_ + +#ifndef _SYS_CDIO_H_ +#define _SYS_CDIO_H_ + +#ifndef KERNEL +#include <sys/types.h> +#endif +#include <sys/ioccom.h> union msf_lba { struct { @@ -259,5 +265,4 @@ struct ioc_capability { /*<2>*/ #define CDIOCCAPABILITY _IOR('c',30,struct ioc_capability) /*<2>*/ -#endif /* _SYS_CDIO_H_ */ - +#endif /* !_SYS_CDIO_H_ */ |
