summaryrefslogtreecommitdiffstats
path: root/polyp
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2004-10-12 21:52:50 +0000
committerLennart Poettering <lennart@poettering.net>2004-10-12 21:52:50 +0000
commita6471e26022a7eada70dd128c51f0fa593718c5d (patch)
treeacacad669528164eb38baa8f8340a34d33b18a83 /polyp
parent6ede161cb94f5123e103fae45ea1918bbebb4956 (diff)
gcc 2.95 fix
default.pa fix git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@254 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp')
-rw-r--r--polyp/authkey.c2
-rwxr-xr-xpolyp/default.pa.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/polyp/authkey.c b/polyp/authkey.c
index 09a2c1b4..d3cb382b 100644
--- a/polyp/authkey.c
+++ b/polyp/authkey.c
@@ -85,9 +85,9 @@ finish:
static int load(const char *fn, void *data, size_t length) {
int fd = -1;
int writable = 1;
- assert(fn && data && length);
int unlock = 0, ret;
ssize_t r;
+ assert(fn && data && length);
if ((fd = open(fn, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR)) < 0) {
if (errno != EACCES || (fd = open(fn, O_RDONLY)) < 0) {
diff --git a/polyp/default.pa.in b/polyp/default.pa.in
index 54feb5ef..97b20963 100755
--- a/polyp/default.pa.in
+++ b/polyp/default.pa.in
@@ -52,7 +52,7 @@ set-default-source input
.nofail
# Load something to the sample cache
-load-sample /usr/share/sounds/KDE_Notify.wav x11-bell
+load-sample x11-bell /usr/share/sounds/KDE_Notify.wav
# Load X11 bell module
load-module module-x11-bell sample=x11-bell sink=output