From 7afed9a1b6d3c3a17f690225ab4254a5583b7d46 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Sun, 4 May 2014 19:09:30 +0300 Subject: [PATCH] Use INLINE and include vpx_config.h instead of plain 'inline' This fixes compilation with MSVC. Change-Id: Iaf7d6b0a0134968a6addf315fde6d852f298db8c --- vp8/common/arm/neon/loopfilter_neon.c | 3 ++- vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c | 3 ++- vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c | 3 ++- vp8/common/arm/neon/mbloopfilter_neon.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/vp8/common/arm/neon/loopfilter_neon.c b/vp8/common/arm/neon/loopfilter_neon.c index 47f522bc6..be77e6726 100644 --- a/vp8/common/arm/neon/loopfilter_neon.c +++ b/vp8/common/arm/neon/loopfilter_neon.c @@ -9,8 +9,9 @@ */ #include +#include "./vpx_config.h" -static inline void vp8_loop_filter_neon( +static INLINE void vp8_loop_filter_neon( uint8x16_t qblimit, // flimit uint8x16_t qlimit, // limit uint8x16_t qthresh, // thresh diff --git a/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c b/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c index 3d024e068..b25686ffb 100644 --- a/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c +++ b/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c @@ -9,8 +9,9 @@ */ #include +#include "./vpx_config.h" -static inline void vp8_loop_filter_simple_horizontal_edge_neon( +static INLINE void vp8_loop_filter_simple_horizontal_edge_neon( unsigned char *s, int p, const unsigned char *blimit) { diff --git a/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c b/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c index 68bcde412..b0952b582 100644 --- a/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c +++ b/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c @@ -9,8 +9,9 @@ */ #include +#include "./vpx_config.h" -static inline void vp8_loop_filter_simple_vertical_edge_neon( +static INLINE void vp8_loop_filter_simple_vertical_edge_neon( unsigned char *s, int p, const unsigned char *blimit) { diff --git a/vp8/common/arm/neon/mbloopfilter_neon.c b/vp8/common/arm/neon/mbloopfilter_neon.c index 396031720..5351f4be6 100644 --- a/vp8/common/arm/neon/mbloopfilter_neon.c +++ b/vp8/common/arm/neon/mbloopfilter_neon.c @@ -9,8 +9,9 @@ */ #include +#include "./vpx_config.h" -static inline void vp8_mbloop_filter_neon( +static INLINE void vp8_mbloop_filter_neon( uint8x16_t qblimit, // mblimit uint8x16_t qlimit, // limit uint8x16_t qthresh, // thresh