summaryrefslogtreecommitdiffstats
path: root/sys/sys/soundcard.h
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1996-09-21 14:59:43 +0000
committerbde <bde@FreeBSD.org>1996-09-21 14:59:43 +0000
commit9bcb122232e4319fd67ee59c7cd43611d5e2fc60 (patch)
treee03f53db0e9dc53fdad8b0a593af598744be17da /sys/sys/soundcard.h
parent178a446971cddf750d684ed6f842b14faed1c64e (diff)
downloadFreeBSD-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/sys/soundcard.h')
-rw-r--r--sys/sys/soundcard.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h
index 3dcdaa1..666a4b8 100644
--- a/sys/sys/soundcard.h
+++ b/sys/sys/soundcard.h
@@ -1,5 +1,3 @@
-#ifndef SOUNDCARD_H
-#define SOUNDCARD_H
/*
* Copyright by Hannu Savolainen 1993
*
@@ -37,10 +35,13 @@
* hannu@voxware.pp.fi
*/
+#ifndef _MACHINE_SOUNDCARD_H_
+#define _MACHINE_SOUNDCARD_H_
+
#define SOUND_VERSION 301
#define VOXWARE
-#include <sys/ioctl.h>
+#include <sys/ioccom.h>
/*
* Supported card ID numbers (Should be somewhere else?)
@@ -1044,5 +1045,6 @@ void seqbuf_dump(void); /* This function must be provided by programs */
perror("Write patch: /dev/sequencer");}
#define SEQ_WRPATCH2(patchx, len) (seqbuf_dump(), write(seqfd, (char*)(patchx), len))
-#endif
-#endif
+#endif /* !KERNEL_SPAM */
+
+#endif /* !_MACHINE_SOUNDCARD_H_ */
OpenPOWER on IntegriCloud