Don't default to (wrong) SCO definitions for _IOR() etc. if <sys/ioctl.h>

doesn't happen to be included before this header.

This header was missed in previous cleanups because it didn't include
<sys/ioctl.h> or <sys/ioccom.h>.  Clean it now:
- #include <sys/types.h> since it is necessary to make the header self-
  sufficient (there are a couple of u_char's).
- uniformized idempotency ifdef.  Copied the style in the 4.4Lite
  ioctl headers.

1 files changed, 8 insertions, 3 deletions

diff --git a/sys/i386/include/qcam.h b/sys/i386/include/qcam.h
index 5ec56dedc4ec..77dd4fb9af2d 100644
--- a/sys/i386/include/qcam.h
+++ b/sys/i386/include/qcam.h
@@ -43,8 +43,13 @@
  *		    number when the interface changes for now...
  */
 
-#ifndef _QUICKCAM_H
-#define _QUICKCAM_H 1
+#ifndef	_MACHINE_QUICKCAM_H_
+#define	_MACHINE_QUICKCAM_H_
+
+#ifndef KERNEL
+#include <sys/types.h>
+#endif
+#include <sys/ioccom.h>
 
 #ifndef	_IOR
 /* SCO doesn't have _IOR/_IOW for ioctls, so fake it out to keep things clean*/
@@ -84,4 +89,4 @@ struct qcam {
 #define	QC_ZOOM_150		0x01		/* 1.5x */
 #define	QC_ZOOM_200		0x02		/* 2.0x */
 
-#endif
+#endif /* !_MACHINE_QUICKCAM_H_ */