diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-01-23 19:46:52 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-01-23 19:46:52 +0100 |
| commit | f6fcbed6d0fd04308341fa27465284212143824b (patch) | |
| tree | 3ce4c938f696a00aa58065a11e7510a95954a6be /src | |
| parent | 5cb29f3a606c8d5e66fea561b8a4ab1fe623a53d (diff) | |
| parent | 3e5d9fd37ab2ebe7160c7ebc4393b15ba68f28e8 (diff) | |
Merge commit 'flameeyes/flameeyes'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/modules/module-detect.c | 2 | ||||
| -rw-r--r-- | src/pulsecore/resampler.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b59e50ae..24623d3f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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) \ diff --git a/src/modules/module-detect.c b/src/modules/module-detect.c index 1616d47c..9ed262db 100644 --- a/src/modules/module-detect.c +++ b/src/modules/module-detect.c @@ -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 diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c index 6b3836e1..ff87284a 100644 --- a/src/pulsecore/resampler.c +++ b/src/pulsecore/resampler.c @@ -25,7 +25,7 @@ #include <string.h> -#if HAVE_LIBSAMPLERATE +#ifdef HAVE_LIBSAMPLERATE #include <samplerate.h> #endif |