/[gentoo-x86]/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch
Gentoo

Contents of /sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Tue May 29 08:18:33 2012 UTC (12 months, 3 weeks ago) by ryao
Branch: MAIN
CVS Tags: HEAD
Rename __atomic_compare_exchange to avoid conflict with builtin, bug #417547, Chainsaw approved

(Portage version: 2.1.10.49/cvs/Linux x86_64)

1 diff --git a/dbinc/atomic.h b/dbinc/atomic.h
2 index 0034dcc..fa7ba93 100644
3 --- a/dbinc/atomic.h
4 +++ b/dbinc/atomic.h
5 @@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
6 #define atomic_inc(env, p) __atomic_inc(p)
7 #define atomic_dec(env, p) __atomic_dec(p)
8 #define atomic_compare_exchange(env, p, o, n) \
9 - __atomic_compare_exchange((p), (o), (n))
10 + __db_atomic_compare_exchange((p), (o), (n))
11 static inline int __atomic_inc(db_atomic_t *p)
12 {
13 int temp;
14 @@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
15 * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
16 * which configure could be changed to use.
17 */
18 -static inline int __atomic_compare_exchange(
19 +static inline int __db_atomic_compare_exchange(
20 db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
21 {
22 atomic_value_t was;

  ViewVC Help
Powered by ViewVC 1.1.20