From 6753fb5138a399b51e65f1dc3e36e73427013379 Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Mon, 18 Jul 2005 13:09:05 +0000 Subject: oops... should compile without warnings now git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7187 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/libmusepack/math.h | 2 +- apps/codecs/libmusepack/synth_filter.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/codecs/libmusepack') diff --git a/apps/codecs/libmusepack/math.h b/apps/codecs/libmusepack/math.h index 532f1350c4..a89ef76f58 100644 --- a/apps/codecs/libmusepack/math.h +++ b/apps/codecs/libmusepack/math.h @@ -99,7 +99,7 @@ static inline MPC_SAMPLE_FORMAT MPC_MULTIPLY_EX(MPC_SAMPLE_FORMAT item1,MPC_SAMP #ifdef MPC_HAVE_MULHIGH #define MPC_MULTIPLY_FRACT(X,Y) _MulHigh(X,Y) #else -#ifdef CPU_COLDFIRE && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) /* loses one bit of accuracy. the rest of the macros won't be as easy as this... */ #define MPC_MULTIPLY_FRACT(X,Y) \ diff --git a/apps/codecs/libmusepack/synth_filter.c b/apps/codecs/libmusepack/synth_filter.c index 105dbb0008..7644551d16 100644 --- a/apps/codecs/libmusepack/synth_filter.c +++ b/apps/codecs/libmusepack/synth_filter.c @@ -335,7 +335,7 @@ static void Synthese_Filter_float_internal(MPC_SAMPLE_FORMAT * OutData,MPC_SAMPL { mpc_uint32_t n; - #ifdef CPU_COLDFIRE && !defined(SIMULATOR) + #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) asm volatile ("move.l #0x20, %macsr"); /* fractional emac mode */ #endif for ( n = 0; n < 36; n++, Y += 32 ) { @@ -350,7 +350,7 @@ static void Synthese_Filter_float_internal(MPC_SAMPLE_FORMAT * OutData,MPC_SAMPL for ( k = 0; k < 32; k++, D += 16, V++ ) { - #ifdef CPU_COLDFIRE && !defined(SIMULATOR) + #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) asm volatile ( "movem.l (%[D]), %%d0-%%d3\n\t" "move.l (%[V]), %%a5\n\t" -- cgit v1.2.3