Merge FreeBSD compatibility patch (from Flameeyes)

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1359 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/modules/oss-util.c b/src/modules/oss-util.c
index d1c623b4c8c45307469c47f80e9e447f50d6d4d2..0aaf6971d4cec595dd1b63cf6f487ce28e86561a 100644 (file)
--- 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 ddb732f03c4f17b87e558915ae4b3fe7781af811..dfef3f3ab50e41e918dc206fd828ccc13b31e4b3 100644 (file)
--- 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,