Merge branch 'master' of git://git.debian.org/git/pkg-pulseaudio/pulseaudio-upstream

[pulseaudio] / src / pulse / thread-mainloop.c

diff --git a/src/pulse/thread-mainloop.c b/src/pulse/thread-mainloop.c
index 29769e2b3d93bc6363f3f0e654b20eecbd4eaa52..6b66696c400790caae7c4fdbea5b151ab8fa2972 100644 (file)
--- a/src/pulse/thread-mainloop.c
+++ b/src/pulse/thread-mainloop.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /***
   This file is part of PulseAudio.
 
@@ -29,8 +27,8 @@
 #include <signal.h>
 #include <stdio.h>
 
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
+#ifdef HAVE_POLL_H
+#include <poll.h>
 #else
 #include <pulsecore/poll.h>
 #endif
@@ -103,7 +101,7 @@ pa_threaded_mainloop *pa_threaded_mainloop_new(void) {
         return NULL;
     }
 
-    m->mutex = pa_mutex_new(1);
+    m->mutex = pa_mutex_new(TRUE, TRUE);
     m->cond = pa_cond_new();
     m->accept_cond = pa_cond_new();
     m->thread = NULL;