From 6327c10702922eabcb1c6170abd3f03d23ce4c51 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 8 Mar 2013 20:57:31 +0100 Subject: [PATCH] atomic: fix CAS with armcc. On the current code, armcc will fail with: "libavutil/atomic_gcc.h", line 52: Error: #2771: first argument must be a pointer to integer or enumeration type --- libavutil/atomic_gcc.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavutil/atomic_gcc.h b/libavutil/atomic_gcc.h index 13713c82e0..9470e8e50b 100644 --- a/libavutil/atomic_gcc.h +++ b/libavutil/atomic_gcc.h @@ -21,6 +21,8 @@ #ifndef AVUTIL_ATOMIC_GCC_H #define AVUTIL_ATOMIC_GCC_H +#include + #include "atomic.h" #define avpriv_atomic_int_get atomic_int_get_gcc @@ -47,7 +49,13 @@ static inline int atomic_int_add_and_fetch_gcc(volatile int *ptr, int inc) static inline void *atomic_ptr_cas_gcc(void * volatile *ptr, void *oldval, void *newval) { +#ifdef __ARMCC_VERSION + // armcc will throw an error if ptr is not an integer type + volatile uintptr_t *tmp = (volatile uintptr_t*)ptr; + return (void*)__sync_val_compare_and_swap(tmp, oldval, newval); +#else return __sync_val_compare_and_swap(ptr, oldval, newval); +#endif } #endif /* AVUTIL_ATOMIC_GCC_H */