From 2ad0dec0b75f2cfc438826e34579a4f7a55426ee Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Sat, 26 Feb 2005 10:31:20 +0000 Subject: Renamed config.h to config-a52.h to avoid name clash with rockbox' config.h git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6068 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/liba52/bit_allocate.c | 2 +- apps/codecs/liba52/bitstream.c | 2 +- apps/codecs/liba52/config-a52.h | 24 ++++++++++++++++++++++++ apps/codecs/liba52/config.h | 23 ----------------------- apps/codecs/liba52/downmix.c | 2 +- apps/codecs/liba52/imdct.c | 2 +- apps/codecs/liba52/parse.c | 2 +- 7 files changed, 29 insertions(+), 28 deletions(-) create mode 100644 apps/codecs/liba52/config-a52.h delete mode 100644 apps/codecs/liba52/config.h (limited to 'apps/codecs/liba52') diff --git a/apps/codecs/liba52/bit_allocate.c b/apps/codecs/liba52/bit_allocate.c index c8da24e9e6..79c4ad8753 100644 --- a/apps/codecs/liba52/bit_allocate.c +++ b/apps/codecs/liba52/bit_allocate.c @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" +#include "config-a52.h" #include diff --git a/apps/codecs/liba52/bitstream.c b/apps/codecs/liba52/bitstream.c index 05e4940dc4..231654939a 100644 --- a/apps/codecs/liba52/bitstream.c +++ b/apps/codecs/liba52/bitstream.c @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" +#include "config-a52.h" #include diff --git a/apps/codecs/liba52/config-a52.h b/apps/codecs/liba52/config-a52.h new file mode 100644 index 0000000000..d8aa77dfae --- /dev/null +++ b/apps/codecs/liba52/config-a52.h @@ -0,0 +1,24 @@ +/* a52dec profiling */ +/* #undef A52DEC_GPROF */ + +/* Define to 1 if you have the `memalign' function. */ +/* #undef HAVE_MEMALIGN 1 */ + +/* liba52 djbfft support */ +/* #undef LIBA52_DJBFFT */ + +/* a52 sample precision */ +/* #undef LIBA52_DOUBLE */ + +/* use fixed-point arithmetic */ +#define LIBA52_FIXED + +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ + +/* Used in bitstream.h */ + +#ifndef SIMULATOR +#define WORDS_BIGENDIAN 1 +#endif + diff --git a/apps/codecs/liba52/config.h b/apps/codecs/liba52/config.h deleted file mode 100644 index 6095368767..0000000000 --- a/apps/codecs/liba52/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* a52dec profiling */ -/* #undef A52DEC_GPROF */ - -/* Define to 1 if you have the `memalign' function. */ -/* #undef HAVE_MEMALIGN 1 */ - -/* liba52 djbfft support */ -/* #undef LIBA52_DJBFFT */ - -/* a52 sample precision */ -/* #undef LIBA52_DOUBLE */ - -/* use fixed-point arithmetic */ -#define LIBA52_FIXED - -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ - -/* Used in bitstream.h */ - -#ifndef SIMULATOR -#define WORDS_BIGENDIAN 1 -#endif diff --git a/apps/codecs/liba52/downmix.c b/apps/codecs/liba52/downmix.c index 89b6da2ae0..7bbf3793f0 100644 --- a/apps/codecs/liba52/downmix.c +++ b/apps/codecs/liba52/downmix.c @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" +#include "config-a52.h" #include #include diff --git a/apps/codecs/liba52/imdct.c b/apps/codecs/liba52/imdct.c index cbede95be6..09fed18ee3 100644 --- a/apps/codecs/liba52/imdct.c +++ b/apps/codecs/liba52/imdct.c @@ -24,7 +24,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" +#include "config-a52.h" #include #include diff --git a/apps/codecs/liba52/parse.c b/apps/codecs/liba52/parse.c index 505a335f09..4846c985ba 100644 --- a/apps/codecs/liba52/parse.c +++ b/apps/codecs/liba52/parse.c @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" +#include "config-a52.h" #include #include -- cgit v1.2.3