From 2ad0dec0b75f2cfc438826e34579a4f7a55426ee Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Sat, 26 Feb 2005 10:31:20 +0000 Subject: [PATCH] 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.h => config-a52.h} | 1 + apps/codecs/liba52/downmix.c | 2 +- apps/codecs/liba52/imdct.c | 2 +- apps/codecs/liba52/parse.c | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) rename apps/codecs/liba52/{config.h => config-a52.h} (99%) 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.h b/apps/codecs/liba52/config-a52.h similarity index 99% rename from apps/codecs/liba52/config.h rename to apps/codecs/liba52/config-a52.h index 6095368767..d8aa77dfae 100644 --- a/apps/codecs/liba52/config.h +++ b/apps/codecs/liba52/config-a52.h @@ -21,3 +21,4 @@ #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