generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove INLINE/FORCEINLINE

Browse Source 
These are mostly vestigial, it's up to the compiler to decide what
should be inlined, and this collided with certain Windows platform SDKs.

Change-Id: I80dd35de25eda7773156e355b5aef8f7e44e179b
This commit is contained in:
John Koleszar 2010-06-24 09:02:48 -04:00
parent d1920de22c
commit 5e34461448
7 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/make/configure.sh
View File

@ -395,8 +395,6 @@ EOF
write_common_target_config_h() { write_common_target_config_h() {
cat > ${TMP_H} << EOF cat > ${TMP_H} << EOF
/* This file automatically generated by configure. Do not edit! */ /* This file automatically generated by configure. Do not edit! */
#define INLINE ${INLINE}
#define FORCEINLINE ${FORCEINLINE:-${INLINE}}
#define RESTRICT ${RESTRICT} #define RESTRICT ${RESTRICT}
EOF EOF
print_config_h ARCH "${TMP_H}" ${ARCH_LIST} print_config_h ARCH "${TMP_H}" ${ARCH_LIST}

2
configure vendored
View File

@ -519,8 +519,6 @@ process_toolchain() {
enable solution enable solution
vs_version=${tgt_cc##vs} vs_version=${tgt_cc##vs}
all_targets="${all_targets} solution" all_targets="${all_targets} solution"
INLINE=__inline
FORCEINLINE=__forceinline
;; ;;
esac esac

2
vp8/vp8dx.mk
View File

@ -30,7 +30,6 @@ CFLAGS+=-I$(SRC_PATH_BARE)/$(VP8_PREFIX)decoder
# common # common
#define ARM #define ARM
#define DISABLE_THREAD #define DISABLE_THREAD
#define INLINE=__forceinline
#INCLUDES += algo/vpx_common/vpx_mem/include #INCLUDES += algo/vpx_common/vpx_mem/include
#INCLUDES += common #INCLUDES += common
@ -44,7 +43,6 @@ CFLAGS+=-I$(SRC_PATH_BARE)/$(VP8_PREFIX)decoder
# decoder # decoder
#define ARM #define ARM
#define DISABLE_THREAD #define DISABLE_THREAD
#define INLINE=__forceinline
#INCLUDES += algo/vpx_common/vpx_mem/include #INCLUDES += algo/vpx_common/vpx_mem/include
#INCLUDES += common #INCLUDES += common

26
vpx_ports/mem_ops.h
View File

@ -60,7 +60,7 @@
#undef mem_get_be16 #undef mem_get_be16
#define mem_get_be16 mem_ops_wrap_symbol(mem_get_be16) #define mem_get_be16 mem_ops_wrap_symbol(mem_get_be16)
static INLINE unsigned MEM_VALUE_T mem_get_be16(const void *vmem) static unsigned MEM_VALUE_T mem_get_be16(const void *vmem)
{ {
unsigned MEM_VALUE_T val; unsigned MEM_VALUE_T val;
const MAU_T *mem = (const MAU_T *)vmem; const MAU_T *mem = (const MAU_T *)vmem;
@ -72,7 +72,7 @@ static INLINE unsigned MEM_VALUE_T mem_get_be16(const void *vmem)
#undef mem_get_be24 #undef mem_get_be24
#define mem_get_be24 mem_ops_wrap_symbol(mem_get_be24) #define mem_get_be24 mem_ops_wrap_symbol(mem_get_be24)
static INLINE unsigned MEM_VALUE_T mem_get_be24(const void *vmem) static unsigned MEM_VALUE_T mem_get_be24(const void *vmem)
{ {
unsigned MEM_VALUE_T val; unsigned MEM_VALUE_T val;
const MAU_T *mem = (const MAU_T *)vmem; const MAU_T *mem = (const MAU_T *)vmem;
@ -85,7 +85,7 @@ static INLINE unsigned MEM_VALUE_T mem_get_be24(const void *vmem)
#undef mem_get_be32 #undef mem_get_be32
#define mem_get_be32 mem_ops_wrap_symbol(mem_get_be32) #define mem_get_be32 mem_ops_wrap_symbol(mem_get_be32)
static INLINE unsigned MEM_VALUE_T mem_get_be32(const void *vmem) static unsigned MEM_VALUE_T mem_get_be32(const void *vmem)
{ {
unsigned MEM_VALUE_T val; unsigned MEM_VALUE_T val;
const MAU_T *mem = (const MAU_T *)vmem; const MAU_T *mem = (const MAU_T *)vmem;
@ -99,7 +99,7 @@ static INLINE unsigned MEM_VALUE_T mem_get_be32(const void *vmem)
#undef mem_get_le16 #undef mem_get_le16
#define mem_get_le16 mem_ops_wrap_symbol(mem_get_le16) #define mem_get_le16 mem_ops_wrap_symbol(mem_get_le16)
static INLINE unsigned MEM_VALUE_T mem_get_le16(const void *vmem) static unsigned MEM_VALUE_T mem_get_le16(const void *vmem)
{ {
unsigned MEM_VALUE_T val; unsigned MEM_VALUE_T val;
const MAU_T *mem = (const MAU_T *)vmem; const MAU_T *mem = (const MAU_T *)vmem;
@ -111,7 +111,7 @@ static INLINE unsigned MEM_VALUE_T mem_get_le16(const void *vmem)
#undef mem_get_le24 #undef mem_get_le24
#define mem_get_le24 mem_ops_wrap_symbol(mem_get_le24) #define mem_get_le24 mem_ops_wrap_symbol(mem_get_le24)
static INLINE unsigned MEM_VALUE_T mem_get_le24(const void *vmem) static unsigned MEM_VALUE_T mem_get_le24(const void *vmem)
{ {
unsigned MEM_VALUE_T val; unsigned MEM_VALUE_T val;
const MAU_T *mem = (const MAU_T *)vmem; const MAU_T *mem = (const MAU_T *)vmem;
@ -124,7 +124,7 @@ static INLINE unsigned MEM_VALUE_T mem_get_le24(const void *vmem)
#undef mem_get_le32 #undef mem_get_le32
#define mem_get_le32 mem_ops_wrap_symbol(mem_get_le32) #define mem_get_le32 mem_ops_wrap_symbol(mem_get_le32)
static INLINE unsigned MEM_VALUE_T mem_get_le32(const void *vmem) static unsigned MEM_VALUE_T mem_get_le32(const void *vmem)
{ {
unsigned MEM_VALUE_T val; unsigned MEM_VALUE_T val;
const MAU_T *mem = (const MAU_T *)vmem; const MAU_T *mem = (const MAU_T *)vmem;
@ -137,7 +137,7 @@ static INLINE unsigned MEM_VALUE_T mem_get_le32(const void *vmem)
} }
#define mem_get_s_generic(end,sz) \ #define mem_get_s_generic(end,sz) \
static INLINE signed MEM_VALUE_T mem_get_s##end##sz(const void *vmem) {\ static signed MEM_VALUE_T mem_get_s##end##sz(const void *vmem) {\
const MAU_T *mem = (const MAU_T*)vmem;\ const MAU_T *mem = (const MAU_T*)vmem;\
signed MEM_VALUE_T val = mem_get_##end##sz(mem);\ signed MEM_VALUE_T val = mem_get_##end##sz(mem);\
return (val << (MEM_VALUE_T_SZ_BITS - sz)) >> (MEM_VALUE_T_SZ_BITS - sz);\ return (val << (MEM_VALUE_T_SZ_BITS - sz)) >> (MEM_VALUE_T_SZ_BITS - sz);\
@ -169,7 +169,7 @@ mem_get_s_generic(le, 32);
#undef mem_put_be16 #undef mem_put_be16
#define mem_put_be16 mem_ops_wrap_symbol(mem_put_be16) #define mem_put_be16 mem_ops_wrap_symbol(mem_put_be16)
static INLINE void mem_put_be16(void *vmem, MEM_VALUE_T val) static void mem_put_be16(void *vmem, MEM_VALUE_T val)
{ {
MAU_T *mem = (MAU_T *)vmem; MAU_T *mem = (MAU_T *)vmem;
@ -179,7 +179,7 @@ static INLINE void mem_put_be16(void *vmem, MEM_VALUE_T val)
#undef mem_put_be24 #undef mem_put_be24
#define mem_put_be24 mem_ops_wrap_symbol(mem_put_be24) #define mem_put_be24 mem_ops_wrap_symbol(mem_put_be24)
static INLINE void mem_put_be24(void *vmem, MEM_VALUE_T val) static void mem_put_be24(void *vmem, MEM_VALUE_T val)
{ {
MAU_T *mem = (MAU_T *)vmem; MAU_T *mem = (MAU_T *)vmem;
@ -190,7 +190,7 @@ static INLINE void mem_put_be24(void *vmem, MEM_VALUE_T val)
#undef mem_put_be32 #undef mem_put_be32
#define mem_put_be32 mem_ops_wrap_symbol(mem_put_be32) #define mem_put_be32 mem_ops_wrap_symbol(mem_put_be32)
static INLINE void mem_put_be32(void *vmem, MEM_VALUE_T val) static void mem_put_be32(void *vmem, MEM_VALUE_T val)
{ {
MAU_T *mem = (MAU_T *)vmem; MAU_T *mem = (MAU_T *)vmem;
@ -202,7 +202,7 @@ static INLINE void mem_put_be32(void *vmem, MEM_VALUE_T val)
#undef mem_put_le16 #undef mem_put_le16
#define mem_put_le16 mem_ops_wrap_symbol(mem_put_le16) #define mem_put_le16 mem_ops_wrap_symbol(mem_put_le16)
static INLINE void mem_put_le16(void *vmem, MEM_VALUE_T val) static void mem_put_le16(void *vmem, MEM_VALUE_T val)
{ {
MAU_T *mem = (MAU_T *)vmem; MAU_T *mem = (MAU_T *)vmem;
@ -212,7 +212,7 @@ static INLINE void mem_put_le16(void *vmem, MEM_VALUE_T val)
#undef mem_put_le24 #undef mem_put_le24
#define mem_put_le24 mem_ops_wrap_symbol(mem_put_le24) #define mem_put_le24 mem_ops_wrap_symbol(mem_put_le24)
static INLINE void mem_put_le24(void *vmem, MEM_VALUE_T val) static void mem_put_le24(void *vmem, MEM_VALUE_T val)
{ {
MAU_T *mem = (MAU_T *)vmem; MAU_T *mem = (MAU_T *)vmem;
@ -223,7 +223,7 @@ static INLINE void mem_put_le24(void *vmem, MEM_VALUE_T val)
#undef mem_put_le32 #undef mem_put_le32
#define mem_put_le32 mem_ops_wrap_symbol(mem_put_le32) #define mem_put_le32 mem_ops_wrap_symbol(mem_put_le32)
static INLINE void mem_put_le32(void *vmem, MEM_VALUE_T val) static void mem_put_le32(void *vmem, MEM_VALUE_T val)
{ {
MAU_T *mem = (MAU_T *)vmem; MAU_T *mem = (MAU_T *)vmem;

12
vpx_ports/mem_ops_aligned.h
View File

@ -40,19 +40,19 @@
#define swap_endian_32_se(val,raw) swap_endian_32(val,raw) #define swap_endian_32_se(val,raw) swap_endian_32(val,raw)
#define mem_get_ne_aligned_generic(end,sz) \ #define mem_get_ne_aligned_generic(end,sz) \
static INLINE unsigned MEM_VALUE_T mem_get_##end##sz##_aligned(const void *vmem) {\ static unsigned MEM_VALUE_T mem_get_##end##sz##_aligned(const void *vmem) {\
const uint##sz##_t *mem = (const uint##sz##_t *)vmem;\ const uint##sz##_t *mem = (const uint##sz##_t *)vmem;\
return *mem;\ return *mem;\
} }
#define mem_get_sne_aligned_generic(end,sz) \ #define mem_get_sne_aligned_generic(end,sz) \
static INLINE signed MEM_VALUE_T mem_get_s##end##sz##_aligned(const void *vmem) {\ static signed MEM_VALUE_T mem_get_s##end##sz##_aligned(const void *vmem) {\
const int##sz##_t *mem = (const int##sz##_t *)vmem;\ const int##sz##_t *mem = (const int##sz##_t *)vmem;\
return *mem;\ return *mem;\
} }
#define mem_get_se_aligned_generic(end,sz) \ #define mem_get_se_aligned_generic(end,sz) \
static INLINE unsigned MEM_VALUE_T mem_get_##end##sz##_aligned(const void *vmem) {\ static unsigned MEM_VALUE_T mem_get_##end##sz##_aligned(const void *vmem) {\
const uint##sz##_t *mem = (const uint##sz##_t *)vmem;\ const uint##sz##_t *mem = (const uint##sz##_t *)vmem;\
unsigned MEM_VALUE_T val, raw = *mem;\ unsigned MEM_VALUE_T val, raw = *mem;\
swap_endian_##sz(val,raw);\ swap_endian_##sz(val,raw);\
@ -60,7 +60,7 @@
} }
#define mem_get_sse_aligned_generic(end,sz) \ #define mem_get_sse_aligned_generic(end,sz) \
static INLINE signed MEM_VALUE_T mem_get_s##end##sz##_aligned(const void *vmem) {\ static signed MEM_VALUE_T mem_get_s##end##sz##_aligned(const void *vmem) {\
const int##sz##_t *mem = (const int##sz##_t *)vmem;\ const int##sz##_t *mem = (const int##sz##_t *)vmem;\
unsigned MEM_VALUE_T val, raw = *mem;\ unsigned MEM_VALUE_T val, raw = *mem;\
swap_endian_##sz##_se(val,raw);\ swap_endian_##sz##_se(val,raw);\
@ -68,13 +68,13 @@
} }
#define mem_put_ne_aligned_generic(end,sz) \ #define mem_put_ne_aligned_generic(end,sz) \
static INLINE void mem_put_##end##sz##_aligned(void *vmem, MEM_VALUE_T val) {\ static void mem_put_##end##sz##_aligned(void *vmem, MEM_VALUE_T val) {\
uint##sz##_t *mem = (uint##sz##_t *)vmem;\ uint##sz##_t *mem = (uint##sz##_t *)vmem;\
*mem = (uint##sz##_t)val;\ *mem = (uint##sz##_t)val;\
} }
#define mem_put_se_aligned_generic(end,sz) \ #define mem_put_se_aligned_generic(end,sz) \
static INLINE void mem_put_##end##sz##_aligned(void *vmem, MEM_VALUE_T val) {\ static void mem_put_##end##sz##_aligned(void *vmem, MEM_VALUE_T val) {\
uint##sz##_t *mem = (uint##sz##_t *)vmem, raw;\ uint##sz##_t *mem = (uint##sz##_t *)vmem, raw;\
swap_endian_##sz(raw,val);\ swap_endian_##sz(raw,val);\
*mem = (uint##sz##_t)raw;\ *mem = (uint##sz##_t)raw;\

6
vpx_ports/vpx_timer.h
View File

@ -51,7 +51,7 @@ struct vpx_usec_timer
}; };
static INLINE void static void
vpx_usec_timer_start(struct vpx_usec_timer *t) vpx_usec_timer_start(struct vpx_usec_timer *t)
{ {
#if defined(_MSC_VER) #if defined(_MSC_VER)
@ -62,7 +62,7 @@ vpx_usec_timer_start(struct vpx_usec_timer *t)
} }
static INLINE void static void
vpx_usec_timer_mark(struct vpx_usec_timer *t) vpx_usec_timer_mark(struct vpx_usec_timer *t)
{ {
#if defined(_MSC_VER) #if defined(_MSC_VER)
@ -73,7 +73,7 @@ vpx_usec_timer_mark(struct vpx_usec_timer *t)
} }
static INLINE long static long
vpx_usec_timer_elapsed(struct vpx_usec_timer *t) vpx_usec_timer_elapsed(struct vpx_usec_timer *t)
{ {
#if defined(_MSC_VER) #if defined(_MSC_VER)

8
vpx_scale/generic/bicubic_scaler.c
View File

@ -46,7 +46,7 @@ static float a = -0.6;
// 3 2 // 3 2
// C0 = a*t - a*t // C0 = a*t - a*t
// //
static INLINE short c0_fixed(unsigned int t) static short c0_fixed(unsigned int t)
{ {
// put t in Q16 notation // put t in Q16 notation
unsigned short v1, v2; unsigned short v1, v2;
@ -67,7 +67,7 @@ static INLINE short c0_fixed(unsigned int t)
// 2 3 // 2 3
// C1 = a*t + (3-2*a)*t - (2-a)*t // C1 = a*t + (3-2*a)*t - (2-a)*t
// //
static INLINE short c1_fixed(unsigned int t) static short c1_fixed(unsigned int t)
{ {
unsigned short v1, v2, v3; unsigned short v1, v2, v3;
unsigned short two, three; unsigned short two, three;
@ -96,7 +96,7 @@ static INLINE short c1_fixed(unsigned int t)
// 2 3 // 2 3
// C2 = 1 - (3-a)*t + (2-a)*t // C2 = 1 - (3-a)*t + (2-a)*t
// //
static INLINE short c2_fixed(unsigned int t) static short c2_fixed(unsigned int t)
{ {
unsigned short v1, v2, v3; unsigned short v1, v2, v3;
unsigned short two, three; unsigned short two, three;
@ -124,7 +124,7 @@ static INLINE short c2_fixed(unsigned int t)
// 2 3 // 2 3
// C3 = a*t - 2*a*t + a*t // C3 = a*t - 2*a*t + a*t
// //
static INLINE short c3_fixed(unsigned int t) static short c3_fixed(unsigned int t)
{ {
int v1, v2, v3; int v1, v2, v3;