61193a6afc
architecture as hp/ux. Regen patches & bump REVISION.
976 B
976 B
$OpenBSD: patch-include_sound_h,v 1.3 2010/10/23 10:52:58 landry Exp $
--- include/sound.h.orig Thu Sep 2 08:34:10 1999
+++ include/sound.h Sat Oct 23 04:44:07 2010
@@ -212,17 +212,23 @@ struct SoundCacheBufferTag {
/*
- * FreeBSD
+ * *BSD
*/
-#if defined(__FreeBSD__) && defined(USE_SOUND)
+#if (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(USE_SOUND)
-/* FreeBSD with SoundBlaster Pro */
+/* *BSD with SoundBlaster Pro */
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
+#if defined(__FreeBSD__)
#include <machine/soundcard.h>
+#endif
+#if defined(__OpenBSD__)
+#include <sys/ioctl.h>
+#include <sys/audioio.h>
+#endif
#undef O_RDWR
#define O_RDWR O_WRONLY /* audio $B%G%P%$%9$OF1;~%*!<%W%s$G$-$J$$!) */
@@ -235,7 +241,7 @@ struct SoundCacheBufferTag {
#define SoundCacheBuffer struct SoundCacheBufferTag
#define AUDIO_DEVICE "/dev/audio"
-#endif /* FreeBSD */
+#endif /* *BSD */
#else /* USE_NETAUDIO */
--- include/sound.h.orig Thu Sep 2 08:34:10 1999
+++ include/sound.h Sat Oct 23 04:44:07 2010
@@ -212,17 +212,23 @@ struct SoundCacheBufferTag {
/*
- * FreeBSD
+ * *BSD
*/
-#if defined(__FreeBSD__) && defined(USE_SOUND)
+#if (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(USE_SOUND)
-/* FreeBSD with SoundBlaster Pro */
+/* *BSD with SoundBlaster Pro */
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
+#if defined(__FreeBSD__)
#include <machine/soundcard.h>
+#endif
+#if defined(__OpenBSD__)
+#include <sys/ioctl.h>
+#include <sys/audioio.h>
+#endif
#undef O_RDWR
#define O_RDWR O_WRONLY /* audio $B%G%P%$%9$OF1;~%*!<%W%s$G$-$J$$!) */
@@ -235,7 +241,7 @@ struct SoundCacheBufferTag {
#define SoundCacheBuffer struct SoundCacheBufferTag
#define AUDIO_DEVICE "/dev/audio"
-#endif /* FreeBSD */
+#endif /* *BSD */
#else /* USE_NETAUDIO */