File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change 4444#ifdef USE_SSE
4545#error SSE is only for floating-point
4646#endif
47- #if (( defined (ARM4_ASM )|| defined ( ARM4_ASM )) && defined(BFIN_ASM )) || (defined ( ARM4_ASM ) && defined( ARM5E_ASM ))
47+ #if defined(ARM4_ASM ) + defined( ARM5E_ASM ) + defined(BFIN_ASM ) > 1
4848#error Make up your mind. What CPU do you have?
4949#endif
5050#ifdef VORBIS_PSYCHO
5656#ifndef FLOATING_POINT
5757#error You now need to define either FIXED_POINT or FLOATING_POINT
5858#endif
59- #if defined (ARM4_ASM ) || defined(ARM5E_ASM ) || defined(BFIN_ASM )
59+ #if defined(ARM4_ASM ) || defined(ARM5E_ASM ) || defined(BFIN_ASM )
6060#error I suppose you can have a [ARM4/ARM5E/Blackfin] that has float instructions?
6161#endif
62- #ifdef FIXED_POINT_DEBUG
62+ #ifdef FIXED_DEBUG
6363#error "Don't you think enabling fixed-point is a good thing to do if you want to debug that?"
6464#endif
6565
@@ -117,9 +117,9 @@ typedef spx_word32_t spx_sig_t;
117117
118118#ifdef ARM5E_ASM
119119#include "fixed_arm5e.h"
120- #elif defined (ARM4_ASM )
120+ #elif defined(ARM4_ASM )
121121#include "fixed_arm4.h"
122- #elif defined (BFIN_ASM )
122+ #elif defined(BFIN_ASM )
123123#include "fixed_bfin.h"
124124#endif
125125
@@ -207,7 +207,7 @@ typedef float spx_word32_t;
207207#endif
208208
209209
210- #if defined (CONFIG_TI_C54X ) || defined (CONFIG_TI_C55X )
210+ #if defined(CONFIG_TI_C54X ) || defined(CONFIG_TI_C55X )
211211
212212/* 2 on TI C5x DSP */
213213#define BYTES_PER_CHAR 2
You can’t perform that action at this time.
0 commit comments