From: Fritz Elfert Date: Fri, 17 Jun 2011 23:10:57 +0000 (+0200) Subject: Disable check for pthreads on win32 X-Git-Tag: v0.99.1~75 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a13da4e93eac1021278e8195c64d9501d7c2d0ef;p=platform%2Fupstream%2Fpulseaudio.git Disable check for pthreads on win32 And do not use sched_get_priority on mingw with win32 pthreads installed --- diff --git a/configure.ac b/configure.ac index 56d4e63..162b383 100644 --- a/configure.ac +++ b/configure.ac @@ -433,7 +433,9 @@ AC_CHECK_DEFINE([INADDR_NONE], [netinet/in.h], [], #### POSIX threads #### -ACX_PTHREAD +# Win32 build breaks with win32 pthread installed +AS_IF([test "x$os_is_win32" != "x1"], + [ACX_PTHREAD]) #### Check for libs #### diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c index 633c315..67b772a 100644 --- a/src/daemon/daemon-conf.c +++ b/src/daemon/daemon-conf.c @@ -478,11 +478,13 @@ static int parse_rtprio(const char *filename, unsigned line, const char *section pa_assert(rvalue); pa_assert(data); -#ifdef HAVE_SCHED_H +#ifndef OS_IS_WIN32 +# ifdef HAVE_SCHED_H if (pa_atoi(rvalue, &rtprio) < 0 || rtprio < sched_get_priority_min(SCHED_FIFO) || rtprio > sched_get_priority_max(SCHED_FIFO)) { pa_log("[%s:%u] Invalid realtime priority '%s'.", filename, line, rvalue); return -1; } +# endif #endif c->realtime_priority = (int) rtprio;