From 9dfbfceea3e2a2767e23753b509d32b7b8ca90aa Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 27 Mar 2008 23:23:24 +0000
Subject: merge r2095 from trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2154 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/pulsecore/rtpoll.c  | 2 ++
 src/tests/rtpoll-test.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/pulsecore/rtpoll.c b/src/pulsecore/rtpoll.c
index 354c4c0e..83008266 100644
--- a/src/pulsecore/rtpoll.c
+++ b/src/pulsecore/rtpoll.c
@@ -161,8 +161,10 @@ void pa_rtpoll_install(pa_rtpoll *p) {
     p->installed = 1;
 
 #ifdef HAVE_PPOLL
+# ifdef __linux__
     if (p->dont_use_ppoll)
         return;
+# endif
 
     if ((p->rtsig = pa_rtsig_get_for_thread()) < 0) {
         pa_log_warn("Failed to reserve POSIX realtime signal.");
diff --git a/src/tests/rtpoll-test.c b/src/tests/rtpoll-test.c
index 3ab992a1..e6493771 100644
--- a/src/tests/rtpoll-test.c
+++ b/src/tests/rtpoll-test.c
@@ -49,7 +49,9 @@ int main(int argc, char *argv[]) {
     pa_rtpoll_item *i, *w;
     struct pollfd *pollfd;
 
+#ifdef SIGRTMIN
     pa_rtsig_configure(SIGRTMIN+10, SIGRTMAX);
+#endif
 
     p = pa_rtpoll_new();
 
-- 
cgit