diff options
| author | Fritz Elfert <fritz@fritz-elfert.de> | 2011-06-18 01:10:57 +0200 |
|---|---|---|
| committer | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2011-06-18 10:51:00 -0700 |
| commit | a13da4e93eac1021278e8195c64d9501d7c2d0ef (patch) | |
| tree | 808176a805a9c97ce44882f1e86f480046d0f24e | |
| parent | 7f48b797581e3559f97814433cf65338e4ea0f28 (diff) | |
Disable check for pthreads on win32
And do not use sched_get_priority on mingw with win32 pthreads installed
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/daemon/daemon-conf.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 56d4e632..162b3831 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 633c3154..67b772ae 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; |