summaryrefslogtreecommitdiff
path: root/audio/xmixer
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2002-09-08 09:55:31 +0000
committerKris Kennaway <kris@FreeBSD.org>2002-09-08 09:55:31 +0000
commit17ac05186dc400072c287cec274e08ac15ef2556 (patch)
tree2465f369ee9b58695ec166b29f8d28497ed9517f /audio/xmixer
parentFix build on -current (machine/soundcard.h -> sys/soundcard.h) (diff)
Fix buildworld in current (machine/soundcard.h -> sys/soundcard.h)
Notes
Notes: svn path=/head/; revision=65832
Diffstat (limited to 'audio/xmixer')
-rw-r--r--audio/xmixer/files/patch-ae12
1 files changed, 4 insertions, 8 deletions
diff --git a/audio/xmixer/files/patch-ae b/audio/xmixer/files/patch-ae
index 08af966700bf..192e7965af29 100644
--- a/audio/xmixer/files/patch-ae
+++ b/audio/xmixer/files/patch-ae
@@ -1,22 +1,18 @@
---- mixer.c.orig Sat Aug 21 15:26:41 1999
-+++ mixer.c Tue Oct 26 23:47:37 1999
-@@ -46,7 +46,18 @@
+--- mixer.c.orig Sun Sep 8 02:03:09 2002
++++ mixer.c Sun Sep 8 02:04:25 2002
+@@ -46,7 +46,14 @@
# include <sys/asound.h>
#endif
#ifdef OSS
-# include <sys/soundcard.h>
+/* "The nice thing about standards..." */
-+#if defined (__linux__) || defined (__bsdi__)
++#if defined (__linux__) || defined (__bsdi__) || defined(__FreeBSD__)
+#include <sys/soundcard.h>
+#else
-+#if defined (__FreeBSD__)
-+#include <machine/soundcard.h>
-+#else
+#if defined (__NetBSD__) || defined (__OpenBSD__)
+#include <soundcard.h> /* OSS emulation */
+#endif
+#endif
-+#endif
#endif
#include "mixer.h"