summaryrefslogtreecommitdiffstats
path: root/src/utils
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-03-31 22:05:10 +0000
committerLennart Poettering <lennart@poettering.net>2008-03-31 22:05:10 +0000
commite382f2233fa1cb35db77bc279c0469ac5c741d4d (patch)
tree6cc839434d9b6367171b509ac1b24daa29840c23 /src/utils
parent1be481f4818360d93391950a3aea5f7010630c73 (diff)
merge r2183 from prepare-0.9.10
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2199 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/padsp.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/utils/padsp.c b/src/utils/padsp.c
index cb57ff8a..d3f034d0 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;