From ecf643966111387953cbfd0bce7f39b6c3d8116a Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 31 Mar 2008 23:08:01 +0000
Subject: catch up with trunk HEAD (i.e. 2118:2213)

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2214 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/utils/pactl.c | 2 +-
 src/utils/padsp.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/utils')

diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index 4381d9d2..674eaee6 100644
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -486,7 +486,7 @@ static void get_autoload_info_callback(pa_context *c, const pa_autoload_info *i,
            i->name,
            i->type == PA_AUTOLOAD_SINK ? "sink" : "source",
            i->module,
-           i->argument);
+           i->argument ? i->argument : "");
 }
 
 static void simple_callback(pa_context *c, int success, void *userdata) {
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;
-- 
cgit