From 526956644ad85ddbad445caf93671577fb990b86 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Wed, 16 May 2012 20:37:39 +0000 Subject: Add 'inline' to suppress unused warnings with Android NDK build. git-svn-id: http://skia.googlecode.com/svn/trunk@3982 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkThread_platform.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/core/SkThread_platform.h b/include/core/SkThread_platform.h index 44dd0d6890..351477569d 100644 --- a/include/core/SkThread_platform.h +++ b/include/core/SkThread_platform.h @@ -19,16 +19,16 @@ /* Just use the GCC atomic intrinsics. They're supported by the NDK toolchain, * have reasonable performance, and provide full memory barriers */ -static __attribute__((always_inline)) int32_t sk_atomic_inc(int32_t *addr) { +static inline __attribute__((always_inline)) int32_t sk_atomic_inc(int32_t *addr) { return __sync_fetch_and_add(addr, 1); } -static __attribute__((always_inline)) int32_t sk_atomic_dec(int32_t *addr) { +static inline __attribute__((always_inline)) int32_t sk_atomic_dec(int32_t *addr) { return __sync_fetch_and_add(addr, -1); } -static __attribute__((always_inline)) void sk_membar_aquire__after_atomic_dec() { } +static inline __attribute__((always_inline)) void sk_membar_aquire__after_atomic_dec() { } -static __attribute__((always_inline)) int32_t sk_atomic_conditional_inc(int32_t* addr) { +static inline __attribute__((always_inline)) int32_t sk_atomic_conditional_inc(int32_t* addr) { int32_t value = *addr; while (true) { @@ -45,7 +45,7 @@ static __attribute__((always_inline)) int32_t sk_atomic_conditional_inc(int32_t* } } } -static __attribute__((always_inline)) void sk_membar_aquire__after_atomic_conditional_inc() { } +static inline __attribute__((always_inline)) void sk_membar_aquire__after_atomic_conditional_inc() { } #else // !SK_BUILD_FOR_ANDROID_NDK -- cgit v1.2.3