| Index: celt/cpu_support.h
 | 
| diff --git a/celt/cpu_support.h b/celt/cpu_support.h
 | 
| index 41481feb9c69041d7f2df636376dd9590ed53a2d..d68dbe62c5b086a59e49f896e16f2eef1270cb07 100644
 | 
| --- a/celt/cpu_support.h
 | 
| +++ b/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;
 | 
|  }
 | 
| 
 |