]> code.delx.au - pulseaudio/commitdiff
Disable check for pthreads on win32
authorFritz Elfert <fritz@fritz-elfert.de>
Fri, 17 Jun 2011 23:10:57 +0000 (01:10 +0200)
committerArun Raghavan <arun.raghavan@collabora.co.uk>
Sat, 18 Jun 2011 17:51:00 +0000 (10:51 -0700)
And do not use sched_get_priority on mingw with win32 pthreads installed

configure.ac
src/daemon/daemon-conf.c

index 56d4e6325fa385f34408d86f90e95684f3e4060f..162b383163875d88914436ccf08a62271fd2cfc2 100644 (file)
@@ -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 ####
 
index 633c31541a152afd42f2d4cb51c979f92e5a9a7e..67b772aead4b2549c4908a5634e7163c0af0161c 100644 (file)
@@ -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;