mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-24 09:25:01 +00:00
dbf33b220e
Modified version of dim's patch, where most of the stuff moves into a REINPLACE_CMD called from post-patch. Submitted by: dim
39 lines
1.5 KiB
C
39 lines
1.5 KiB
C
--- ../src/dbinc/atomic.h.orig 2012-02-29 19:48:38.000000000 +0100
|
|
+++ ../src/dbinc/atomic.h 2012-05-04 22:39:32.000000000 +0200
|
|
@@ -70,7 +70,7 @@ typedef struct {
|
|
* These have no memory barriers; the caller must include them when necessary.
|
|
*/
|
|
#define atomic_read(p) ((p)->value)
|
|
-#define atomic_init(p, val) ((p)->value = (val))
|
|
+#define db_atomic_init(p, val) ((p)->value = (val))
|
|
|
|
#ifdef HAVE_ATOMIC_SUPPORT
|
|
|
|
@@ -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))
|
|
+ __atomic_compare_exchange_db((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
|
|
* 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 __atomic_compare_exchange_db(
|
|
db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
|
|
{
|
|
atomic_value_t was;
|
|
@@ -206,7 +206,7 @@ static inline int __atomic_compare_excha
|
|
#define atomic_dec(env, p) (--(p)->value)
|
|
#define atomic_compare_exchange(env, p, oldval, newval) \
|
|
(DB_ASSERT(env, atomic_read(p) == (oldval)), \
|
|
- atomic_init(p, (newval)), 1)
|
|
+ db_atomic_init(p, (newval)), 1)
|
|
#else
|
|
#define atomic_inc(env, p) __atomic_inc(env, p)
|
|
#define atomic_dec(env, p) __atomic_dec(env, p)
|