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/i386/include/ioctl_meteor.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/i386/include/ioctl_meteor.h')
| -rw-r--r-- | sys/i386/include/ioctl_meteor.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/i386/include/ioctl_meteor.h b/sys/i386/include/ioctl_meteor.h index f432550..919100f 100644 --- a/sys/i386/include/ioctl_meteor.h +++ b/sys/i386/include/ioctl_meteor.h @@ -32,10 +32,13 @@ * ioctl constants for Matrox Meteor Capture card. */ -#ifndef _MACHINE_IOCTL_METEOR_H -#define _MACHINE_IOCTL_METEOR_H +#ifndef _MACHINE_IOCTL_METEOR_H_ +#define _MACHINE_IOCTL_METEOR_H_ -#include <sys/ioctl.h> +#ifndef KERNEL +#include <sys/types.h> +#endif +#include <sys/ioccom.h> struct meteor_capframe { short command; /* see below for valid METEORCAPFRM commands */ @@ -179,4 +182,4 @@ struct meteor_mem { caddr_t buf; /* The real space (virtual addr) */ } ; -#endif /* ifndef _MACHINE_IOCTL_METEOR_H */ +#endif /* !_MACHINE_IOCTL_METEOR_H_ */ |
