merge r2095 from trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2154 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-03-27 23:23:24 +00:00
parent cc59e76b73
commit 9dfbfceea3
2 changed files with 4 additions and 0 deletions

View file

@ -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.");

View file

@ -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();