merge r2183 from prepare-0.9.10

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

diff --git a/src/utils/padsp.c b/src/utils/padsp.c
index cb57ff8..d3f034d 100644 (file)
--- a/src/utils/padsp.c
+++ b/src/utils/padsp.c
@@ -2307,7 +2307,11 @@ fail:
     return ret;
 }
 
+#ifdef sun
+int ioctl(int fd, int request, ...) {
+#else
 int ioctl(int fd, unsigned long request, ...) {
+#endif
     fd_info *i;
     va_list args;
     void *argp;