mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-06 13:29:56 -05:00
Windows doesn't have POSIX thread. ifdef out things for now.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@824 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
9e60bad5c3
commit
1438bd49dc
2 changed files with 23 additions and 3 deletions
|
|
@ -181,7 +181,6 @@ pabrowse_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
|
||||||
|
|
||||||
noinst_PROGRAMS = \
|
noinst_PROGRAMS = \
|
||||||
mainloop-test \
|
mainloop-test \
|
||||||
thread-mainloop-test \
|
|
||||||
mcalign-test \
|
mcalign-test \
|
||||||
pacat-simple \
|
pacat-simple \
|
||||||
parec-simple \
|
parec-simple \
|
||||||
|
|
@ -207,6 +206,12 @@ noinst_PROGRAMS += \
|
||||||
mainloop-test-glib12
|
mainloop-test-glib12
|
||||||
endif
|
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
|
mainloop_test_SOURCES = tests/mainloop-test.c
|
||||||
mainloop_test_CFLAGS = $(AM_CFLAGS)
|
mainloop_test_CFLAGS = $(AM_CFLAGS)
|
||||||
mainloop_test_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la
|
mainloop_test_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la
|
||||||
|
|
|
||||||
|
|
@ -23,17 +23,27 @@
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <pthread.h>
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <sys/poll.h>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_SYS_POLL_H
|
||||||
|
#include <sys/poll.h>
|
||||||
|
#else
|
||||||
|
#include "../polypcore/poll.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_PTHREAD
|
||||||
|
#include <pthread.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <polypcore/xmalloc.h>
|
#include <polypcore/xmalloc.h>
|
||||||
|
|
||||||
#include "mainloop.h"
|
#include "mainloop.h"
|
||||||
#include "thread-mainloop.h"
|
#include "thread-mainloop.h"
|
||||||
|
|
||||||
|
#ifndef OS_IS_WIN32
|
||||||
|
|
||||||
struct pa_threaded_mainloop {
|
struct pa_threaded_mainloop {
|
||||||
pa_mainloop *real_mainloop;
|
pa_mainloop *real_mainloop;
|
||||||
pthread_t thread_id;
|
pthread_t thread_id;
|
||||||
|
|
@ -201,3 +211,8 @@ pa_mainloop_api* pa_threaded_mainloop_get_api(pa_threaded_mainloop*m) {
|
||||||
return pa_mainloop_get_api(m->real_mainloop);
|
return pa_mainloop_get_api(m->real_mainloop);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#else /* OS_IS_WIN32 */
|
||||||
|
|
||||||
|
// FIXME: Use Win32 primitives
|
||||||
|
|
||||||
|
#endif /* OS_IS_WIN32 */
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue