| Index: celt/arch.h
|
| diff --git a/celt/arch.h b/celt/arch.h
|
| index f9c98567aa848944eae08fc25423c9d65db58c23..3bbcd3663a24b3a08190dd9c7e9ae7d4495e4034 100644
|
| --- a/celt/arch.h
|
| +++ b/celt/arch.h
|
| @@ -35,6 +35,7 @@
|
| #define ARCH_H
|
|
|
| #include "opus_types.h"
|
| +#include "opus_defines.h"
|
|
|
| # if !defined(__GNUC_PREREQ)
|
| # if defined(__GNUC__)&&defined(__GNUC_MINOR__)
|
| @@ -54,7 +55,7 @@
|
| #ifdef __GNUC__
|
| __attribute__((noreturn))
|
| #endif
|
| -static inline void _celt_fatal(const char *str, const char *file, int line)
|
| +static OPUS_INLINE void _celt_fatal(const char *str, const char *file, int line)
|
| {
|
| fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str);
|
| abort();
|
| @@ -113,9 +114,9 @@ typedef opus_val32 celt_ener;
|
|
|
| #include "fixed_generic.h"
|
|
|
| -#ifdef ARMv5E_ASM
|
| +#ifdef OPUS_ARM_INLINE_EDSP
|
| #include "arm/fixed_armv5e.h"
|
| -#elif defined (ARMv4_ASM)
|
| +#elif defined (OPUS_ARM_INLINE_ASM)
|
| #include "arm/fixed_armv4.h"
|
| #elif defined (BFIN_ASM)
|
| #include "fixed_bfin.h"
|
|
|