From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 31 Mar 2008 22:05:10 +0000 (+0000)
Subject: merge r2183 from prepare-0.9.10
X-Git-Tag: v0.9.11~196
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e382f2233fa1cb35db77bc279c0469ac5c741d4d;p=platform%2Fupstream%2Fpulseaudio.git

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 cb57ff8a9..d3f034d0f 100644
--- 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;