summaryrefslogtreecommitdiff
path: root/lib/libossaudio
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-03-23 20:38:11 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-03-23 20:38:11 +0000
commit3da20b9c77f492d866f278ead6ad3906c7b0a5d4 (patch)
tree53bd3330ae5ccff29320f249bdfeb88e11472d85 /lib/libossaudio
parent8e16712145eb716d9b20ce95a50c3b3f4ce5d1d7 (diff)
Force inclusion of <sys/ioctl.h> before the body of soundcard.h.
Since soundcard.h #defines ioctl to oss_ioctl we need to see the ioctl prototype first. This works around a problem exposed by the __P removal. A slightly better solution may be to simply replace ioctl() in libossaudio, calling the real ioctl() via syscall(2) when needed.
Diffstat (limited to 'lib/libossaudio')
-rw-r--r--lib/libossaudio/soundcard.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libossaudio/soundcard.h b/lib/libossaudio/soundcard.h
index 755d7b04f54..63bd7ed1f52 100644
--- a/lib/libossaudio/soundcard.h
+++ b/lib/libossaudio/soundcard.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: soundcard.h,v 1.7 2002/02/16 21:27:27 millert Exp $ */
+/* $OpenBSD: soundcard.h,v 1.8 2002/03/23 20:38:10 millert Exp $ */
/* $NetBSD: soundcard.h,v 1.11 2001/05/09 21:49:58 augustss Exp $ */
/*-
@@ -47,9 +47,9 @@
#ifndef _SOUNDCARD_H_
#define _SOUNDCARD_H_
-#ifndef _IOWR
-#include <sys/ioccom.h>
-#endif /* !_IOWR */
+#ifndef _SYS_IOCTL_H_
+#include <sys/ioctl.h>
+#endif /* !_SYS_IOCTL_H_ */
#define SOUND_VERSION 0x030001