[pulseaudio-commits] r1359 - in /trunk/src: modules/oss-util.c utils/padsp.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Sat Sep  2 14:03:18 2006
New Revision: 1359

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1359&root=pulseaudio&view=rev
Log:
Merge FreeBSD compatibility patch (from Flameeyes)

Modified:
    trunk/src/modules/oss-util.c
    trunk/src/utils/padsp.c

Modified: trunk/src/modules/oss-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/oss-util.c?rev=1359&root=pulseaudio&r1=1358&r2=1359&view=diff
==============================================================================
--- trunk/src/modules/oss-util.c (original)
+++ trunk/src/modules/oss-util.c Sat Sep  2 14:03:18 2006
@@ -93,7 +93,11 @@
     
     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 @@
 #else
                  "",
 #endif
+#ifdef DSP_CAP_MULTI
                  *pcaps & DSP_CAP_MULTI ? " MULTI" : "",
+#else
+		 "",
+#endif
 #ifdef DSP_CAP_OUTPUT
                  *pcaps & DSP_CAP_OUTPUT ? " OUTPUT" : "",
 #else

Modified: trunk/src/utils/padsp.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/padsp.c?rev=1359&root=pulseaudio&r1=1358&r2=1359&view=diff
==============================================================================
--- trunk/src/utils/padsp.c (original)
+++ trunk/src/utils/padsp.c Sat Sep  2 14:03:18 2006
@@ -52,6 +52,11 @@
 #include <pulse/pulseaudio.h>
 #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,