| 1 |
ryao 12/05/29 08:18:33 |
| 2 |
|
| 3 |
Added: db-4.8.30-rename-atomic-compare-exchange.patch |
| 4 |
Log: |
| 5 |
Rename __atomic_compare_exchange to avoid conflict with builtin, bug #417547, Chainsaw approved |
| 6 |
|
| 7 |
(Portage version: 2.1.10.49/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/db/files/db-4.8.30-rename-atomic-compare-exchange.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: db-4.8.30-rename-atomic-compare-exchange.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/dbinc/atomic.h b/dbinc/atomic.h |
| 18 |
index 0034dcc..fa7ba93 100644 |
| 19 |
--- a/dbinc/atomic.h |
| 20 |
+++ b/dbinc/atomic.h |
| 21 |
@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; |
| 22 |
#define atomic_inc(env, p) __atomic_inc(p) |
| 23 |
#define atomic_dec(env, p) __atomic_dec(p) |
| 24 |
#define atomic_compare_exchange(env, p, o, n) \ |
| 25 |
- __atomic_compare_exchange((p), (o), (n)) |
| 26 |
+ __db_atomic_compare_exchange((p), (o), (n)) |
| 27 |
static inline int __atomic_inc(db_atomic_t *p) |
| 28 |
{ |
| 29 |
int temp; |
| 30 |
@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p) |
| 31 |
* http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html |
| 32 |
* which configure could be changed to use. |
| 33 |
*/ |
| 34 |
-static inline int __atomic_compare_exchange( |
| 35 |
+static inline int __db_atomic_compare_exchange( |
| 36 |
db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) |
| 37 |
{ |
| 38 |
atomic_value_t was; |
Archives