mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-12 13:30:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'flameeyes/flameeyes'

Browse source
This commit is contained in:
Lennart Poettering 2009-01-23 19:46:52 +01:00
commit f6fcbed6d0
6 changed files with 38 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Makefile.am
View file

@ -60,7 +60,6 @@ AM_CFLAGS = \
-I$(top_builddir)/src/modules/alsa \
-I$(top_srcdir)/src/modules/raop \
$(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \
$(LTDLINCL) \
$(LIBSAMPLERATE_CFLAGS) \
$(LIBSNDFILE_CFLAGS) \
$(LIBSPEEX_CFLAGS) \

2
src/modules/module-detect.c
View file

@ -239,7 +239,7 @@ int pa__init(pa_module*m) {
#ifdef HAVE_ALSA
if ((n = detect_alsa(m->core, just_one)) <= 0)
#endif
#if HAVE_OSS
#ifdef HAVE_OSS
if ((n = detect_oss(m->core, just_one)) <= 0)
#endif
#ifdef HAVE_SOLARIS

2
src/pulsecore/resampler.c
View file

@ -25,7 +25,7 @@
#include <string.h>
#if HAVE_LIBSAMPLERATE
#ifdef HAVE_LIBSAMPLERATE
#include <samplerate.h>
#endif