[polypaudio-commits] r824 - in /trunk/src: Makefile.am polyp/thread-mainloop.c

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Tue May  2 10:41:41 2006
New Revision: 824

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=824&root=polypaudio&view=rev
Log:
Windows doesn't have POSIX thread. ifdef out things for now.

Modified:
    trunk/src/Makefile.am
    trunk/src/polyp/thread-mainloop.c

Modified: trunk/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/Makefile.am?rev=824&root=polypaudio&r1=823&r2=824&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Tue May  2 10:41:41 2006
@@ -181,7 +181,6 @@
 
 noinst_PROGRAMS = \
 		mainloop-test \
-		thread-mainloop-test \
 		mcalign-test \
 		pacat-simple \
 		parec-simple \
@@ -205,6 +204,12 @@
 if HAVE_GLIB12
 noinst_PROGRAMS += \
 		mainloop-test-glib12
+endif
+
+# FIXME: We need to make thread-mainloop win32-compatible first
+if !OS_IS_WIN32
+noinst_PROGRAMS += \
+		thread-mainloop-test
 endif
 
 mainloop_test_SOURCES = tests/mainloop-test.c

Modified: trunk/src/polyp/thread-mainloop.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/polyp/thread-mainloop.c?rev=824&root=polypaudio&r1=823&r2=824&view=diff
==============================================================================
--- trunk/src/polyp/thread-mainloop.c (original)
+++ trunk/src/polyp/thread-mainloop.c Tue May  2 10:41:41 2006
@@ -23,16 +23,26 @@
 #include <config.h>
 #endif
 
-#include <pthread.h>
 #include <assert.h>
 #include <signal.h>
+#include <stdio.h>
+
+#ifdef HAVE_SYS_POLL_H
 #include <sys/poll.h>
-#include <stdio.h>
+#else
+#include "../polypcore/poll.h"
+#endif
+
+#ifdef HAVE_PTHREAD
+#include <pthread.h>
+#endif
 
 #include <polypcore/xmalloc.h>
 
 #include "mainloop.h"
 #include "thread-mainloop.h"
+
+#ifndef OS_IS_WIN32
 
 struct pa_threaded_mainloop {
     pa_mainloop *real_mainloop;
@@ -201,3 +211,8 @@
     return pa_mainloop_get_api(m->real_mainloop);
 }
 
+#else /* OS_IS_WIN32 */
+
+// FIXME: Use Win32 primitives
+
+#endif /* OS_IS_WIN32 */