aboutsummaryrefslogtreecommitdiff
path: root/sys/i386/include/speaker.h
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>1996-09-21 14:59:43 +0000
committerBruce Evans <bde@FreeBSD.org>1996-09-21 14:59:43 +0000
commitebedb5ad97718c0a271659c2563834837607f03f (patch)
treee03f53db0e9dc53fdad8b0a593af598744be17da /sys/i386/include/speaker.h
parent83f52dababadc2c364a5ad22dbef8ea4e197530c (diff)
downloadsrc-ebedb5ad97718c0a271659c2563834837607f03f.tar.gz
src-ebedb5ad97718c0a271659c2563834837607f03f.zip
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.
Notes
Notes: svn path=/head/; revision=18444
Diffstat (limited to 'sys/i386/include/speaker.h')
-rw-r--r--sys/i386/include/speaker.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/i386/include/speaker.h b/sys/i386/include/speaker.h
index f097e4807cf8..7a233c712a0c 100644
--- a/sys/i386/include/speaker.h
+++ b/sys/i386/include/speaker.h
@@ -4,13 +4,13 @@
* v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
* modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
*
- * $Id$
+ * $Id: speaker.h,v 1.2 1994/08/02 07:39:05 davidg Exp $
*/
-#ifndef _SPEAKER_H_
-#define _SPEAKER_H_
+#ifndef _MACHINE_SPEAKER_H_
+#define _MACHINE_SPEAKER_H_
-#include <sys/ioctl.h>
+#include <sys/ioccom.h>
#define SPKRTONE _IOW('S', 1, tone_t) /* emit tone */
#define SPKRTUNE _IO('S', 2) /* emit tone sequence*/
@@ -27,6 +27,4 @@ tone_t;
* see the spkr(4) man page for details.
*/
-#endif /* _SPEAKER_H_ */
-
-/* speaker.h ends here */
+#endif /* !_MACHINE_SPEAKER_H_ */