1--- src/dbinc/atomic.h	2013-03-12 14:07:22.000000000 -0400
2+++ src/dbinc/atomic.h.change	2013-03-12 14:06:35.000000000 -0400
3@@ -144,7 +144,7 @@
4 #define	atomic_inc(env, p)	__atomic_inc(p)
5 #define	atomic_dec(env, p)	__atomic_dec(p)
6 #define	atomic_compare_exchange(env, p, o, n)	\
7-	__atomic_compare_exchange((p), (o), (n))
8+	__atomic_compare_exchange_db((p), (o), (n))
9 static inline int __atomic_inc(db_atomic_t *p)
10 {
11 	int	temp;
12@@ -176,7 +176,7 @@
13  * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
14  * which configure could be changed to use.
15  */
16-static inline int __atomic_compare_exchange(
17+static inline int __atomic_compare_exchange_db(
18 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
19 {
20 	atomic_value_t was;
21