summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-09-02 12:03:18 +0000
committerLennart Poettering <lennart@poettering.net>2006-09-02 12:03:18 +0000
commit5fa9cdb6b4be9f5998af462a858124a528914bf3 (patch)
tree78996661e78b53b2ee430074963ff5212dd156a8 /src
parent647ef180c3dac933963fdfeca53772bd3be894ae (diff)
Merge FreeBSD compatibility patch (from Flameeyes)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1359 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src')
-rw-r--r--src/modules/oss-util.c8
-rw-r--r--src/utils/padsp.c5
2 files changed, 13 insertions, 0 deletions
diff --git a/src/modules/oss-util.c b/src/modules/oss-util.c
index d1c623b4..0aaf6971 100644
--- a/src/modules/oss-util.c
+++ b/src/modules/oss-util.c
@@ -93,7 +93,11 @@ success:
pa_log_debug("capabilities:%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
*pcaps & DSP_CAP_BATCH ? " BATCH" : "",
+#ifdef DSP_CAP_BIND
*pcaps & DSP_CAP_BIND ? " BIND" : "",
+#else
+ "",
+#endif
*pcaps & DSP_CAP_COPROC ? " COPROC" : "",
*pcaps & DSP_CAP_DUPLEX ? " DUPLEX" : "",
#ifdef DSP_CAP_FREERATE
@@ -112,7 +116,11 @@ success:
#else
"",
#endif
+#ifdef DSP_CAP_MULTI
*pcaps & DSP_CAP_MULTI ? " MULTI" : "",
+#else
+ "",
+#endif
#ifdef DSP_CAP_OUTPUT
*pcaps & DSP_CAP_OUTPUT ? " OUTPUT" : "",
#else
diff --git a/src/utils/padsp.c b/src/utils/padsp.c
index ddb732f0..dfef3f3a 100644
--- a/src/utils/padsp.c
+++ b/src/utils/padsp.c
@@ -53,6 +53,11 @@
#include <pulsecore/llist.h>
#include <pulsecore/gccmacro.h>
+/* On some systems SIOCINQ isn't defined, but FIONREAD is just an alias */
+#if !defined(SIOCINQ) && defined(FIONREAD)
+# define SIOCINQ FIONREAD
+#endif
+
typedef enum {
FD_INFO_MIXER,
FD_INFO_STREAM,