From 4600198816924dd14a0444a2c0c2887e5a9650ee Mon Sep 17 00:00:00 2001 From: Dongkyun Son Date: Fri, 3 Jan 2020 19:50:31 +0900 Subject: [PATCH] Fixes gcc8 build error: In file included from ../src/dbinc/mutex_int.h:12, from ../src/dbinc/mutex.h:15, from ./db_int.h:1113, from ../lang/cxx/cxx_channel.cpp:11: ../src/dbinc/atomic.h:179:19: error: definition of 'int __atomic_compare_exchange(db_atomic_t*, atomic_value_t, atomic_value_t)' ambiguates built-in declaration 'bool __atomic_compare_exchange(long unsigned int, volatile void*, void*, void*, int, int)' static inline int __atomic_compare_exchange( ^~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: I733aeb261576b76cdfd83ef54c33e2919ebfc9bf Signed-off-by: Bernd Kuhls --- dbinc/atomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dbinc/atomic.h b/dbinc/atomic.h index 0034dcc..fa7ba93 100644 --- a/dbinc/atomic.h +++ b/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; -- 2.7.4