From e3c2ed7a71f65dc721c7210f120259ecd4ff65cb Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Wed, 11 Dec 2013 22:59:14 +0100 Subject: Sync libopus to upstream release 1.1 Change-Id: I9fea7460fc33f60faff961b3389dd97b5191463c --- lib/rbcodec/codecs/libopus/celt/cpu_support.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/rbcodec/codecs/libopus/celt/cpu_support.h') diff --git a/lib/rbcodec/codecs/libopus/celt/cpu_support.h b/lib/rbcodec/codecs/libopus/celt/cpu_support.h index 41481feb9c..d68dbe62c5 100644 --- a/lib/rbcodec/codecs/libopus/celt/cpu_support.h +++ b/lib/rbcodec/codecs/libopus/celt/cpu_support.h @@ -28,7 +28,10 @@ #ifndef CPU_SUPPORT_H #define CPU_SUPPORT_H -#if defined(OPUS_HAVE_RTCD) && defined(ARMv4_ASM) +#include "opus_types.h" +#include "opus_defines.h" + +#if defined(OPUS_HAVE_RTCD) && defined(OPUS_ARM_ASM) #include "arm/armcpu.h" /* We currently support 4 ARM variants: @@ -42,7 +45,7 @@ #else #define OPUS_ARCHMASK 0 -static inline int opus_select_arch(void) +static OPUS_INLINE int opus_select_arch(void) { return 0; } -- cgit v1.2.3