rename config.h to config-speex.h

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12750 a1c6a512-1295-4272-9138-f99709370657

38 files changed, 39 insertions, 38 deletions

diff --git a/apps/codecs/libspeex/README.rockbox b/apps/codecs/libspeex/README.rockbox
index 7f7f975eb1..6aeda714ab 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 6ea495f8f4..6173246380 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 <speex/speex_bits.h>
diff --git a/apps/codecs/libspeex/cb_search.c b/apps/codecs/libspeex/cb_search.c
index 6c4f0680a5..ce7ae7e8ce 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.h b/apps/codecs/libspeex/config-speex.h
index 6b71993155..6b71993155 100644
--- a/apps/codecs/libspeex/config.h
+++ b/apps/codecs/libspeex/config-speex.h
diff --git a/apps/codecs/libspeex/fftwrap.c b/apps/codecs/libspeex/fftwrap.c
index 35e2d05ab6..38ff9c000c 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 187d5eea90..e665560bff 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 d49d4d80b3..1ae6854d51 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 ae60f73d1e..02919e2135 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 449e7b8fa7..3470d1108e 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 392945cb81..ef8e464dcd 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 d4d80dc399..75115d7a25 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 fd5d3821e0..9845633a6c 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 a73d8835f0..fcc12515c3 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 <math.h>
diff --git a/apps/codecs/libspeex/ltp.c b/apps/codecs/libspeex/ltp.c
index fa77da2b9d..30d543a934 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 <math.h>
diff --git a/apps/codecs/libspeex/math_approx.c b/apps/codecs/libspeex/math_approx.c
index 21af7667aa..5c8b3498c4 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 498dd3908f..d67c36d6dc 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 97b35b3085..a0a6e3da37 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 <stdlib.h>
diff --git a/apps/codecs/libspeex/modes.c b/apps/codecs/libspeex/modes.c
index 4b21ad75c3..652fcf9550 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 5befb3bb37..85e4ca015e 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 <math.h>
diff --git a/apps/codecs/libspeex/preprocess.c b/apps/codecs/libspeex/preprocess.c
index c4217f4ab3..d030d3fcb2 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 <math.h>
diff --git a/apps/codecs/libspeex/quant_lsp.c b/apps/codecs/libspeex/quant_lsp.c
index d907b98e4d..472efa95a6 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 74d5f40b11..22ed21c64a 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 b1159cd687..0b4b619e52 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 <math.h>
diff --git a/apps/codecs/libspeex/smallft.c b/apps/codecs/libspeex/smallft.c
index ad8c3d9329..079e773659 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 <math.h>
diff --git a/apps/codecs/libspeex/speex.c b/apps/codecs/libspeex/speex.c
index 846e02186c..17a987fde0 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 682322e695..c7ac3b5544 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 <speex/speex_callbacks.h>
diff --git a/apps/codecs/libspeex/speex_header.c b/apps/codecs/libspeex/speex_header.c
index 7fc2f5aa93..13b114a3bc 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 f18387e572..ced56b1134 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 <speex/speex_stereo.h>
diff --git a/apps/codecs/libspeex/testdenoise.c b/apps/codecs/libspeex/testdenoise.c
index 42644cb011..1b681866de 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 <speex/speex_preprocess.h>
diff --git a/apps/codecs/libspeex/testecho.c b/apps/codecs/libspeex/testecho.c
index 7c32c8f60e..d59dbf94cf 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 <stdio.h>
diff --git a/apps/codecs/libspeex/testenc.c b/apps/codecs/libspeex/testenc.c
index eabd02cc76..17141fa09e 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 <speex/speex.h>
diff --git a/apps/codecs/libspeex/testenc_uwb.c b/apps/codecs/libspeex/testenc_uwb.c
index e9bf18a667..f6b943d46f 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 <speex/speex.h>
diff --git a/apps/codecs/libspeex/testenc_wb.c b/apps/codecs/libspeex/testenc_wb.c
index 8e515cb13c..f55dffaaba 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 <speex/speex.h>
diff --git a/apps/codecs/libspeex/testresample.c b/apps/codecs/libspeex/testresample.c
index 5e024795d9..bb7ab74db0 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 <stdio.h>
diff --git a/apps/codecs/libspeex/vbr.c b/apps/codecs/libspeex/vbr.c
index d24ec0f0af..405b7bd887 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 6aac56f2e1..fe01af145f 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 d40133f3e8..f9ee3b4a86 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 65b1917562..55ceadf5b8 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"