From e07ed338278fa7fb2db40ebbadb03514182be97f Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sun, 25 Jul 2010 14:32:18 +0200 Subject: [PATCH] 3rdparty/libsamplerate: renamed config.h to src_config.h We must not have any file called config.h in directories which are added to global include directories. For example when building the CALF plugin the file config.h from libsamplerate was used rather than CALF's local one. Fixes missing LADSPA symbols in CALF library if no usable libsamplerate was found in the system at configure time. Also bumped version number in src_config.h. --- src/3rdparty/samplerate/float_cast.h | 2 +- src/3rdparty/samplerate/samplerate.c | 2 +- src/3rdparty/samplerate/{config.h => src_config.h} | 2 +- src/3rdparty/samplerate/src_linear.c | 2 +- src/3rdparty/samplerate/src_sinc.c | 2 +- src/3rdparty/samplerate/src_zoh.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename src/3rdparty/samplerate/{config.h => src_config.h} (82%) diff --git a/src/3rdparty/samplerate/float_cast.h b/src/3rdparty/samplerate/float_cast.h index af3f237ed..ee981c5e4 100644 --- a/src/3rdparty/samplerate/float_cast.h +++ b/src/3rdparty/samplerate/float_cast.h @@ -45,7 +45,7 @@ ** long int lrint (double x) ; */ -#include "config.h" +#include "src_config.h" /* ** The presence of the required functions are detected during the configure diff --git a/src/3rdparty/samplerate/samplerate.c b/src/3rdparty/samplerate/samplerate.c index 67062e257..b41555f16 100644 --- a/src/3rdparty/samplerate/samplerate.c +++ b/src/3rdparty/samplerate/samplerate.c @@ -26,7 +26,7 @@ #include #include -#include "config.h" +#include "src_config.h" #include "samplerate.h" #include "float_cast.h" diff --git a/src/3rdparty/samplerate/config.h b/src/3rdparty/samplerate/src_config.h similarity index 82% rename from src/3rdparty/samplerate/config.h rename to src/3rdparty/samplerate/src_config.h index 9d6531864..77ba02454 100644 --- a/src/3rdparty/samplerate/config.h +++ b/src/3rdparty/samplerate/src_config.h @@ -5,4 +5,4 @@ #endif #define PACKAGE "libsamplerate" -#define VERSION "0.1.4" +#define VERSION "0.1.7" diff --git a/src/3rdparty/samplerate/src_linear.c b/src/3rdparty/samplerate/src_linear.c index f97ba45db..cfd585a3e 100644 --- a/src/3rdparty/samplerate/src_linear.c +++ b/src/3rdparty/samplerate/src_linear.c @@ -26,7 +26,7 @@ #include #include -#include "config.h" +#include "src_config.h" #include "float_cast.h" #include "common.h" diff --git a/src/3rdparty/samplerate/src_sinc.c b/src/3rdparty/samplerate/src_sinc.c index b9b00fed9..846e30a57 100644 --- a/src/3rdparty/samplerate/src_sinc.c +++ b/src/3rdparty/samplerate/src_sinc.c @@ -26,7 +26,7 @@ #include #include -#include "config.h" +#include "src_config.h" #include "float_cast.h" #include "common.h" diff --git a/src/3rdparty/samplerate/src_zoh.c b/src/3rdparty/samplerate/src_zoh.c index 5f36d28f6..87545f555 100644 --- a/src/3rdparty/samplerate/src_zoh.c +++ b/src/3rdparty/samplerate/src_zoh.c @@ -26,7 +26,7 @@ #include #include -#include "config.h" +#include "src_config.h" #include "float_cast.h" #include "common.h"