Commit 6327c107 authored by Anton Khirnov's avatar Anton Khirnov

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
parent 486f0b0c
......@@ -21,6 +21,8 @@
#include <stdint.h>
#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)
// 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);
return __sync_val_compare_and_swap(ptr, oldval, newval);
#endif /* AVUTIL_ATOMIC_GCC_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment