Commit | Line | Data |
---|---|---|
bd4dac21 VM |
1 | From 29621d637e30982489693f2e207ce6a1790e3337 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | |
3 | Date: Wed, 22 Mar 2017 15:32:26 +0000 | |
4 | Subject: [PATCH] atomic: Rename local __atomic_compare_exchange to avoid clash | |
5 | with builtins | |
6 | ||
7 | Helps building with clang | |
8 | ||
9 | Fixes | |
10 | ||
11 | ../db-5.3.28/src/dbinc/atomic.h:179:19: error: definition of builtin function '__atomic_compare_exchange' | |
12 | static inline int __atomic_compare_exchange( | |
13 | ||
14 | Upstream-Status: Pending | |
15 | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | |
17 | --- | |
18 | src/dbinc/atomic.h | 4 ++-- | |
19 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
20 | ||
21 | diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h | |
22 | index 6a858f7..1b49de5 100644 | |
23 | --- a/src/dbinc/atomic.h | |
24 | +++ b/src/dbinc/atomic.h | |
25 | @@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; | |
26 | #define atomic_inc(env, p) __atomic_inc(p) | |
27 | #define atomic_dec(env, p) __atomic_dec(p) | |
28 | #define atomic_compare_exchange(env, p, o, n) \ | |
29 | - __atomic_compare_exchange((p), (o), (n)) | |
30 | + __db_atomic_compare_exchange((p), (o), (n)) | |
31 | static inline int __atomic_inc(db_atomic_t *p) | |
32 | { | |
33 | int temp; | |
34 | @@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p) | |
35 | * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html | |
36 | * which configure could be changed to use. | |
37 | */ | |
38 | -static inline int __atomic_compare_exchange( | |
39 | +static inline int __db_atomic_compare_exchange( | |
40 | db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) | |
41 | { | |
42 | atomic_value_t was; | |
43 | -- | |
44 | 1.8.3.1 | |
45 |