From 29621d637e30982489693f2e207ce6a1790e3337 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 22 Mar 2017 15:32:26 +0000 Subject: [PATCH] atomic: Rename local __atomic_compare_exchange to avoid clash with builtins Helps building with clang Fixes ../db-5.3.28/src/dbinc/atomic.h:179:19: error: definition of builtin function '__atomic_compare_exchange' static inline int __atomic_compare_exchange( Upstream-Status: Pending Signed-off-by: Khem Raj --- src/dbinc/atomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h index 6a858f7..1b49de5 100644 --- a/src/dbinc/atomic.h +++ b/src/dbinc/atomic.h @@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; #define atomic_inc(env, p) __atomic_inc(p) #define atomic_dec(env, p) __atomic_dec(p) #define atomic_compare_exchange(env, p, o, n) \ - __atomic_compare_exchange((p), (o), (n)) + __db_atomic_compare_exchange((p), (o), (n)) static inline int __atomic_inc(db_atomic_t *p) { int temp; @@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p) * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html * which configure could be changed to use. */ -static inline int __atomic_compare_exchange( +static inline int __db_atomic_compare_exchange( db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) { atomic_value_t was; -- 1.8.3.1