gcc 2.95 fix

default.pa fix

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

diff --git a/polyp/authkey.c b/polyp/authkey.c
index 09a2c1b402d7e0d59706e790e87b0f71a51018f2..d3cb382be21885dbccfd9f0ddbc7c1cb2afbb2f0 100644 (file)
--- 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 54feb5ef7bcc51e5c62159e24d8ba39036922498..97b209639c088a9a2b6efff569ba395c9d334c14 100755 (executable)
--- 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