From 5cbaa286411a7b7fc203c4c9260b13ff858ff69e Mon Sep 17 00:00:00 2001 From: Marcoen Hirschberg Date: Tue, 13 Mar 2007 14:23:20 +0000 Subject: rename config.h to config-speex.h git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12750 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/libspeex/README.rockbox | 2 +- apps/codecs/libspeex/bits.c | 2 +- apps/codecs/libspeex/cb_search.c | 2 +- apps/codecs/libspeex/config-speex.h | 166 +++++++++++++++++++++++++++++++++ apps/codecs/libspeex/config.h | 166 --------------------------------- apps/codecs/libspeex/fftwrap.c | 2 +- apps/codecs/libspeex/filterbank.c | 2 +- apps/codecs/libspeex/filters.c | 5 +- apps/codecs/libspeex/jitter.c | 2 +- apps/codecs/libspeex/kiss_fft.c | 2 +- apps/codecs/libspeex/kiss_fftr.c | 2 +- apps/codecs/libspeex/lbr_48k_tables.c | 2 +- apps/codecs/libspeex/lpc.c | 2 +- apps/codecs/libspeex/lsp.c | 2 +- apps/codecs/libspeex/ltp.c | 2 +- apps/codecs/libspeex/math_approx.c | 2 +- apps/codecs/libspeex/mdf.c | 2 +- apps/codecs/libspeex/misc.c | 2 +- apps/codecs/libspeex/modes.c | 2 +- apps/codecs/libspeex/nb_celp.c | 2 +- apps/codecs/libspeex/preprocess.c | 2 +- apps/codecs/libspeex/quant_lsp.c | 2 +- apps/codecs/libspeex/resample.c | 2 +- apps/codecs/libspeex/sb_celp.c | 2 +- apps/codecs/libspeex/smallft.c | 2 +- apps/codecs/libspeex/speex.c | 2 +- apps/codecs/libspeex/speex_callbacks.c | 2 +- apps/codecs/libspeex/speex_header.c | 2 +- apps/codecs/libspeex/stereo.c | 2 +- apps/codecs/libspeex/testdenoise.c | 2 +- apps/codecs/libspeex/testecho.c | 2 +- apps/codecs/libspeex/testenc.c | 2 +- apps/codecs/libspeex/testenc_uwb.c | 2 +- apps/codecs/libspeex/testenc_wb.c | 2 +- apps/codecs/libspeex/testresample.c | 2 +- apps/codecs/libspeex/vbr.c | 2 +- apps/codecs/libspeex/vorbis_psy.c | 2 +- apps/codecs/libspeex/vq.c | 2 +- apps/codecs/libspeex/window.c | 2 +- 39 files changed, 205 insertions(+), 204 deletions(-) create mode 100644 apps/codecs/libspeex/config-speex.h delete mode 100644 apps/codecs/libspeex/config.h (limited to 'apps/codecs/libspeex') diff --git a/apps/codecs/libspeex/README.rockbox b/apps/codecs/libspeex/README.rockbox index 7f7f975..6aeda71 100644 --- a/apps/codecs/libspeex/README.rockbox +++ b/apps/codecs/libspeex/README.rockbox @@ -19,7 +19,7 @@ The .[ch] files from speex/libspeex/ and speex/include/ were imported into Rockbox. This includes the test files. Some hackery was done to the include files so that they #include properly when built in Rockbox. -A simple config.h file was added to enable libspeex's fixed-point +A simple config-speex.h file was added to enable libspeex's fixed-point integer-only mode and to specify the endianness of the target CPU. Also, ARM specific optimisations were enabled. diff --git a/apps/codecs/libspeex/bits.c b/apps/codecs/libspeex/bits.c index 6ea495f..6173246 100644 --- a/apps/codecs/libspeex/bits.c +++ b/apps/codecs/libspeex/bits.c @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include diff --git a/apps/codecs/libspeex/cb_search.c b/apps/codecs/libspeex/cb_search.c index 6c4f068..ce7ae7e 100644 --- a/apps/codecs/libspeex/cb_search.c +++ b/apps/codecs/libspeex/cb_search.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include "cb_search.h" diff --git a/apps/codecs/libspeex/config-speex.h b/apps/codecs/libspeex/config-speex.h new file mode 100644 index 0000000..6b71993 --- /dev/null +++ b/apps/codecs/libspeex/config-speex.h @@ -0,0 +1,166 @@ +#include "autoconf.h" +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Make use of ARM4 assembly optimizations */ +/* #undef ARM4_ASM */ + +/* Make use of ARM5E assembly optimizations */ +#if defined(CPU_ARM) && !defined(SIMULATOR) +#define ARM5E_ASM 1 +#endif + +/* Make use of Blackfin assembly optimizations */ +/* #undef BFIN_ASM */ + +/* Disable wideband codec */ +/* #undef DISABLE_WIDEBAND */ + +/* Enable valgrind extra checks */ +/* #undef ENABLE_VALGRIND */ + +/* Enable support for Epic 4.8 kbps mode */ +/* #undef EPIC_48K */ + +/* Debug fixed-point implementation */ +/* #undef FIXED_DEBUG */ + +/* Compile as fixed-point */ +#define FIXED_POINT + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_DLFCN_H */ + +/* Define to 1 if you have the `getopt_long' function. */ +#define HAVE_GETOPT_LONG 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `m' library (-lm). */ +/* #undef HAVE_LIBM */ + +/* Define to 1 if you have the `winmm' library (-lwinmm). */ +/* #undef HAVE_LIBWINMM */ + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_AUDIOIO_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOUNDCARD_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* Reduce precision to 16 bits (EXPERIMENTAL) */ +/* #undef PRECISION16 */ + +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + +/* Version extra */ +#define SPEEX_EXTRA_VERSION "-svn" + +/* Version major */ +#define SPEEX_MAJOR_VERSION 1 + +/* Version micro */ +#define SPEEX_MICRO_VERSION 14 + +/* Version minor */ +#define SPEEX_MINOR_VERSION 1 + +/* Complete version string */ +#define SPEEX_VERSION "1.1.14-svn" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Enable support for TI C55X DSP */ +/* #undef TI_C55X */ + +/* Make use of alloca */ +/* #undef USE_ALLOCA */ + +/* Use C99 variable-size arrays */ +#define VAR_ARRAYS + +/* Enable Vorbis-style psychoacoustics (EXPERIMENTAL) */ +/* #undef VORBIS_PSYCHO */ + +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +#ifdef ROCKBOX_BIG_ENDIAN +#define WORDS_BIGENDIAN 1 +#endif + +/* Enable SSE support */ +/* #undef _USE_SSE */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to equivalent of C99 restrict keyword, or to nothing if this is not + supported. Do not define if restrict is supported directly. */ +#define restrict __restrict + +#define RELEASE 1 +#define OVERRIDE_SPEEX_ALLOC 1 +#define OVERRIDE_SPEEX_ALLOC_SCRATCH 1 +#define OVERRIDE_SPEEX_REALLOC 1 +#define OVERRIDE_SPEEX_FREE 1 +#define OVERRIDE_SPEEX_FREE_SCRATCH 1 +#define OVERRIDE_SPEEX_MOVE 1 +#define OVERRIDE_SPEEX_ERROR 1 +#define OVERRIDE_SPEEX_WARNING 1 +#define OVERRIDE_SPEEX_WARNING_INT 1 +#define OVERRIDE_SPEEX_PUTC 1 + diff --git a/apps/codecs/libspeex/config.h b/apps/codecs/libspeex/config.h deleted file mode 100644 index 6b71993..0000000 --- a/apps/codecs/libspeex/config.h +++ /dev/null @@ -1,166 +0,0 @@ -#include "autoconf.h" -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Make use of ARM4 assembly optimizations */ -/* #undef ARM4_ASM */ - -/* Make use of ARM5E assembly optimizations */ -#if defined(CPU_ARM) && !defined(SIMULATOR) -#define ARM5E_ASM 1 -#endif - -/* Make use of Blackfin assembly optimizations */ -/* #undef BFIN_ASM */ - -/* Disable wideband codec */ -/* #undef DISABLE_WIDEBAND */ - -/* Enable valgrind extra checks */ -/* #undef ENABLE_VALGRIND */ - -/* Enable support for Epic 4.8 kbps mode */ -/* #undef EPIC_48K */ - -/* Debug fixed-point implementation */ -/* #undef FIXED_DEBUG */ - -/* Compile as fixed-point */ -#define FIXED_POINT - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define to 1 if you have the `getopt_long' function. */ -#define HAVE_GETOPT_LONG 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the `m' library (-lm). */ -/* #undef HAVE_LIBM */ - -/* Define to 1 if you have the `winmm' library (-lwinmm). */ -/* #undef HAVE_LIBWINMM */ - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_AUDIOIO_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_SOUNDCARD_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" - -/* Reduce precision to 16 bits (EXPERIMENTAL) */ -/* #undef PRECISION16 */ - -/* The size of `int', as computed by sizeof. */ -#define SIZEOF_INT 4 - -/* The size of `long', as computed by sizeof. */ -#define SIZEOF_LONG 4 - -/* The size of `short', as computed by sizeof. */ -#define SIZEOF_SHORT 2 - -/* Version extra */ -#define SPEEX_EXTRA_VERSION "-svn" - -/* Version major */ -#define SPEEX_MAJOR_VERSION 1 - -/* Version micro */ -#define SPEEX_MICRO_VERSION 14 - -/* Version minor */ -#define SPEEX_MINOR_VERSION 1 - -/* Complete version string */ -#define SPEEX_VERSION "1.1.14-svn" - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Enable support for TI C55X DSP */ -/* #undef TI_C55X */ - -/* Make use of alloca */ -/* #undef USE_ALLOCA */ - -/* Use C99 variable-size arrays */ -#define VAR_ARRAYS - -/* Enable Vorbis-style psychoacoustics (EXPERIMENTAL) */ -/* #undef VORBIS_PSYCHO */ - -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -#ifdef ROCKBOX_BIG_ENDIAN -#define WORDS_BIGENDIAN 1 -#endif - -/* Enable SSE support */ -/* #undef _USE_SSE */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif - -/* Define to equivalent of C99 restrict keyword, or to nothing if this is not - supported. Do not define if restrict is supported directly. */ -#define restrict __restrict - -#define RELEASE 1 -#define OVERRIDE_SPEEX_ALLOC 1 -#define OVERRIDE_SPEEX_ALLOC_SCRATCH 1 -#define OVERRIDE_SPEEX_REALLOC 1 -#define OVERRIDE_SPEEX_FREE 1 -#define OVERRIDE_SPEEX_FREE_SCRATCH 1 -#define OVERRIDE_SPEEX_MOVE 1 -#define OVERRIDE_SPEEX_ERROR 1 -#define OVERRIDE_SPEEX_WARNING 1 -#define OVERRIDE_SPEEX_WARNING_INT 1 -#define OVERRIDE_SPEEX_PUTC 1 - diff --git a/apps/codecs/libspeex/fftwrap.c b/apps/codecs/libspeex/fftwrap.c index 35e2d05..38ff9c0 100644 --- a/apps/codecs/libspeex/fftwrap.c +++ b/apps/codecs/libspeex/fftwrap.c @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif /*#define USE_SMALLFT*/ diff --git a/apps/codecs/libspeex/filterbank.c b/apps/codecs/libspeex/filterbank.c index 187d5ee..e665560 100644 --- a/apps/codecs/libspeex/filterbank.c +++ b/apps/codecs/libspeex/filterbank.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include "filterbank.h" diff --git a/apps/codecs/libspeex/filters.c b/apps/codecs/libspeex/filters.c index d49d4d8..1ae6854 100644 --- a/apps/codecs/libspeex/filters.c +++ b/apps/codecs/libspeex/filters.c @@ -31,10 +31,9 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif -#include "filters.h" #include "stack_alloc.h" #include "misc.h" #include "math_approx.h" @@ -47,6 +46,8 @@ #include "filters_arm4.h" #elif defined (BFIN_ASM) #include "filters_bfin.h" +#else +#include "filters.h" #endif diff --git a/apps/codecs/libspeex/jitter.c b/apps/codecs/libspeex/jitter.c index ae60f73..02919e2 100644 --- a/apps/codecs/libspeex/jitter.c +++ b/apps/codecs/libspeex/jitter.c @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif diff --git a/apps/codecs/libspeex/kiss_fft.c b/apps/codecs/libspeex/kiss_fft.c index 449e7b8..3470d11 100644 --- a/apps/codecs/libspeex/kiss_fft.c +++ b/apps/codecs/libspeex/kiss_fft.c @@ -15,7 +15,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include "_kiss_fft_guts.h" diff --git a/apps/codecs/libspeex/kiss_fftr.c b/apps/codecs/libspeex/kiss_fftr.c index 392945c..ef8e464 100644 --- a/apps/codecs/libspeex/kiss_fftr.c +++ b/apps/codecs/libspeex/kiss_fftr.c @@ -13,7 +13,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include "kiss_fftr.h" diff --git a/apps/codecs/libspeex/lbr_48k_tables.c b/apps/codecs/libspeex/lbr_48k_tables.c index d4d80dc..75115d7 100644 --- a/apps/codecs/libspeex/lbr_48k_tables.c +++ b/apps/codecs/libspeex/lbr_48k_tables.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif diff --git a/apps/codecs/libspeex/lpc.c b/apps/codecs/libspeex/lpc.c index fd5d382..9845633 100644 --- a/apps/codecs/libspeex/lpc.c +++ b/apps/codecs/libspeex/lpc.c @@ -50,7 +50,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include "lpc.h" diff --git a/apps/codecs/libspeex/lsp.c b/apps/codecs/libspeex/lsp.c index a73d883..fcc1251 100644 --- a/apps/codecs/libspeex/lsp.c +++ b/apps/codecs/libspeex/lsp.c @@ -80,7 +80,7 @@ Heavily modified by Jean-Marc Valin (c) 2002-2006 (fixed-point, \*---------------------------------------------------------------------------*/ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include diff --git a/apps/codecs/libspeex/ltp.c b/apps/codecs/libspeex/ltp.c index fa77da2..30d543a 100644 --- a/apps/codecs/libspeex/ltp.c +++ b/apps/codecs/libspeex/ltp.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include diff --git a/apps/codecs/libspeex/math_approx.c b/apps/codecs/libspeex/math_approx.c index 21af766..5c8b349 100644 --- a/apps/codecs/libspeex/math_approx.c +++ b/apps/codecs/libspeex/math_approx.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include "math_approx.h" diff --git a/apps/codecs/libspeex/mdf.c b/apps/codecs/libspeex/mdf.c index 498dd39..d67c36d 100644 --- a/apps/codecs/libspeex/mdf.c +++ b/apps/codecs/libspeex/mdf.c @@ -66,7 +66,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include "misc.h" diff --git a/apps/codecs/libspeex/misc.c b/apps/codecs/libspeex/misc.c index 97b35b3..a0a6e3d 100644 --- a/apps/codecs/libspeex/misc.c +++ b/apps/codecs/libspeex/misc.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include diff --git a/apps/codecs/libspeex/modes.c b/apps/codecs/libspeex/modes.c index 4b21ad7..652fcf9 100644 --- a/apps/codecs/libspeex/modes.c +++ b/apps/codecs/libspeex/modes.c @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include "modes.h" diff --git a/apps/codecs/libspeex/nb_celp.c b/apps/codecs/libspeex/nb_celp.c index 5befb3b..85e4ca0 100644 --- a/apps/codecs/libspeex/nb_celp.c +++ b/apps/codecs/libspeex/nb_celp.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include diff --git a/apps/codecs/libspeex/preprocess.c b/apps/codecs/libspeex/preprocess.c index c4217f4..d030d3f 100644 --- a/apps/codecs/libspeex/preprocess.c +++ b/apps/codecs/libspeex/preprocess.c @@ -56,7 +56,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include diff --git a/apps/codecs/libspeex/quant_lsp.c b/apps/codecs/libspeex/quant_lsp.c index d907b98..472efa9 100644 --- a/apps/codecs/libspeex/quant_lsp.c +++ b/apps/codecs/libspeex/quant_lsp.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include "quant_lsp.h" diff --git a/apps/codecs/libspeex/resample.c b/apps/codecs/libspeex/resample.c index 74d5f40..22ed21c 100644 --- a/apps/codecs/libspeex/resample.c +++ b/apps/codecs/libspeex/resample.c @@ -51,7 +51,7 @@ TODO list: */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #ifdef OUTSIDE_SPEEX diff --git a/apps/codecs/libspeex/sb_celp.c b/apps/codecs/libspeex/sb_celp.c index b1159cd..0b4b619 100644 --- a/apps/codecs/libspeex/sb_celp.c +++ b/apps/codecs/libspeex/sb_celp.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include diff --git a/apps/codecs/libspeex/smallft.c b/apps/codecs/libspeex/smallft.c index ad8c3d9..079e773 100644 --- a/apps/codecs/libspeex/smallft.c +++ b/apps/codecs/libspeex/smallft.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include diff --git a/apps/codecs/libspeex/speex.c b/apps/codecs/libspeex/speex.c index 846e021..17a987f 100644 --- a/apps/codecs/libspeex/speex.c +++ b/apps/codecs/libspeex/speex.c @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include "modes.h" diff --git a/apps/codecs/libspeex/speex_callbacks.c b/apps/codecs/libspeex/speex_callbacks.c index 682322e..c7ac3b5 100644 --- a/apps/codecs/libspeex/speex_callbacks.c +++ b/apps/codecs/libspeex/speex_callbacks.c @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include diff --git a/apps/codecs/libspeex/speex_header.c b/apps/codecs/libspeex/speex_header.c index 7fc2f5a..13b114a 100644 --- a/apps/codecs/libspeex/speex_header.c +++ b/apps/codecs/libspeex/speex_header.c @@ -32,7 +32,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include "misc.h" diff --git a/apps/codecs/libspeex/stereo.c b/apps/codecs/libspeex/stereo.c index f18387e..ced56b1 100644 --- a/apps/codecs/libspeex/stereo.c +++ b/apps/codecs/libspeex/stereo.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include diff --git a/apps/codecs/libspeex/testdenoise.c b/apps/codecs/libspeex/testdenoise.c index 42644cb..1b68186 100644 --- a/apps/codecs/libspeex/testdenoise.c +++ b/apps/codecs/libspeex/testdenoise.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include diff --git a/apps/codecs/libspeex/testecho.c b/apps/codecs/libspeex/testecho.c index 7c32c8f..d59dbf9 100644 --- a/apps/codecs/libspeex/testecho.c +++ b/apps/codecs/libspeex/testecho.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include diff --git a/apps/codecs/libspeex/testenc.c b/apps/codecs/libspeex/testenc.c index eabd02c..17141fa 100644 --- a/apps/codecs/libspeex/testenc.c +++ b/apps/codecs/libspeex/testenc.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include diff --git a/apps/codecs/libspeex/testenc_uwb.c b/apps/codecs/libspeex/testenc_uwb.c index e9bf18a..f6b943d 100644 --- a/apps/codecs/libspeex/testenc_uwb.c +++ b/apps/codecs/libspeex/testenc_uwb.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include diff --git a/apps/codecs/libspeex/testenc_wb.c b/apps/codecs/libspeex/testenc_wb.c index 8e515cb..f55dffa 100644 --- a/apps/codecs/libspeex/testenc_wb.c +++ b/apps/codecs/libspeex/testenc_wb.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include diff --git a/apps/codecs/libspeex/testresample.c b/apps/codecs/libspeex/testresample.c index 5e02479..bb7ab74 100644 --- a/apps/codecs/libspeex/testresample.c +++ b/apps/codecs/libspeex/testresample.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include diff --git a/apps/codecs/libspeex/vbr.c b/apps/codecs/libspeex/vbr.c index d24ec0f..405b7bd 100644 --- a/apps/codecs/libspeex/vbr.c +++ b/apps/codecs/libspeex/vbr.c @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include "vbr.h" diff --git a/apps/codecs/libspeex/vorbis_psy.c b/apps/codecs/libspeex/vorbis_psy.c index 6aac56f..fe01af1 100644 --- a/apps/codecs/libspeex/vorbis_psy.c +++ b/apps/codecs/libspeex/vorbis_psy.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #ifdef VORBIS_PSYCHO diff --git a/apps/codecs/libspeex/vq.c b/apps/codecs/libspeex/vq.c index d40133f..f9ee3b4 100644 --- a/apps/codecs/libspeex/vq.c +++ b/apps/codecs/libspeex/vq.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include "vq.h" diff --git a/apps/codecs/libspeex/window.c b/apps/codecs/libspeex/window.c index 65b1917..55ceadf 100644 --- a/apps/codecs/libspeex/window.c +++ b/apps/codecs/libspeex/window.c @@ -30,7 +30,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "config-speex.h" #endif #include "misc.h" -- cgit v1.1