From 9bcb122232e4319fd67ee59c7cd43611d5e2fc60 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Sat, 21 Sep 1996 14:59:43 +0000
Subject: 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.

---
 sys/dev/bktr/ioctl_meteor.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'sys/dev/bktr')

diff --git a/sys/dev/bktr/ioctl_meteor.h b/sys/dev/bktr/ioctl_meteor.h
index f432550..919100f 100644
--- a/sys/dev/bktr/ioctl_meteor.h
+++ b/sys/dev/bktr/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_ */
-- 
cgit v1.1