Define SIMD_INLINE using AOM_FORCE_INLINE
Change-Id: I7d6394e48e9b6093e5b523387ed250f371ee7fb9
diff --git a/aom_dsp/aom_simd.h b/aom_dsp/aom_simd.h
index 7ffca4a..3879d95 100644
--- a/aom_dsp/aom_simd.h
+++ b/aom_dsp/aom_simd.h
@@ -9,20 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
-#ifndef _AOM_SIMD_H
-#define _AOM_SIMD_H
-
-#ifndef SIMD_INLINE
-#ifdef __GNUC__
-#define SIMD_INLINE static inline __attribute__((always_inline))
-#elif __STDC_VERSION__ >= 199901L
-#define SIMD_INLINE static inline
-#elif defined(_MSC_VER)
-#define SIMD_INLINE static __inline
-#else
-#define SIMD_INLINE static
-#endif
-#endif
+#ifndef AOM_DSP_AOM_AOM_SIMD_H_
+#define AOM_DSP_AOM_AOM_SIMD_H_
#include <stdint.h>
@@ -31,6 +19,7 @@
#endif
#include "./aom_config.h"
+#include "./aom_simd_inline.h"
#if HAVE_NEON
#include "simd/v128_intrinsics_arm.h"
@@ -40,4 +29,4 @@
#include "simd/v128_intrinsics.h"
#endif
-#endif /* _AOM_SIMD_H */
+#endif // AOM_DSP_AOM_AOM_SIMD_H_