[pulseaudio-commits] r2154 - in /branches/prepare-0.9.10/src: pulsecore/rtpoll.c tests/rtpoll-test.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Fri Mar 28 00:23:24 2008
New Revision: 2154

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2154&root=pulseaudio&view=rev
Log:
merge r2095 from trunk

Modified:
    branches/prepare-0.9.10/src/pulsecore/rtpoll.c
    branches/prepare-0.9.10/src/tests/rtpoll-test.c

Modified: branches/prepare-0.9.10/src/pulsecore/rtpoll.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/prepare-0.9.10/src/pulsecore/rtpoll.c?rev=2154&root=pulseaudio&r1=2153&r2=2154&view=diff
==============================================================================
--- branches/prepare-0.9.10/src/pulsecore/rtpoll.c (original)
+++ branches/prepare-0.9.10/src/pulsecore/rtpoll.c Fri Mar 28 00:23:24 2008
@@ -161,8 +161,10 @@
     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.");

Modified: branches/prepare-0.9.10/src/tests/rtpoll-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/prepare-0.9.10/src/tests/rtpoll-test.c?rev=2154&root=pulseaudio&r1=2153&r2=2154&view=diff
==============================================================================
--- branches/prepare-0.9.10/src/tests/rtpoll-test.c (original)
+++ branches/prepare-0.9.10/src/tests/rtpoll-test.c Fri Mar 28 00:23:24 2008
@@ -49,7 +49,9 @@
     pa_rtpoll_item *i, *w;
     struct pollfd *pollfd;
 
+#ifdef SIGRTMIN
     pa_rtsig_configure(SIGRTMIN+10, SIGRTMAX);
+#endif
 
     p = pa_rtpoll_new();