diff options
| author | bde <bde@FreeBSD.org> | 1997-03-24 11:07:52 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-03-24 11:07:52 +0000 |
| commit | 2652de9da3ad6362e6f6db93daf108da125fadf4 (patch) | |
| tree | c6601f5f75342f641f070115346c11b57a2254ee /sys/i386/include/qcam.h | |
| parent | b7b1dda54d9ef7696d0bdc386e9bc29f7e641553 (diff) | |
| download | FreeBSD-src-2652de9da3ad6362e6f6db93daf108da125fadf4.zip FreeBSD-src-2652de9da3ad6362e6f6db93daf108da125fadf4.tar.gz | |
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.
Diffstat (limited to 'sys/i386/include/qcam.h')
| -rw-r--r-- | sys/i386/include/qcam.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/i386/include/qcam.h b/sys/i386/include/qcam.h index 5ec56de..77dd4fb 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_ */ |
