From: Mathieu Desnoyers Date: Sun, 27 Sep 2009 03:48:10 +0000 (-0400) Subject: Merge branch 'master' into urcu/ht X-Git-Tag: v0.7.0~43^2~248 X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=commitdiff_plain;h=4dbccaea57365135d2629ff83e7d8f568979c921;hp=2ed9584921304d4b526b530c29dae75f24649c92 Merge branch 'master' into urcu/ht --- diff --git a/urcu-qsbr.h b/urcu-qsbr.h index 346f906..fdf4712 100644 --- a/urcu-qsbr.h +++ b/urcu-qsbr.h @@ -57,6 +57,7 @@ #define rcu_thread_online _rcu_thread_online #define rcu_assign_pointer _rcu_assign_pointer +#define rcu_cmpxchg_pointer _rcu_cmpxchg_pointer #define rcu_xchg_pointer _rcu_xchg_pointer #define rcu_publish_content _rcu_publish_content diff --git a/urcu.h b/urcu.h index 5d92aa7..e72b574 100644 --- a/urcu.h +++ b/urcu.h @@ -56,6 +56,7 @@ #define rcu_read_unlock _rcu_read_unlock #define rcu_assign_pointer _rcu_assign_pointer +#define rcu_cmpxchg_pointer _rcu_cmpxchg_pointer #define rcu_xchg_pointer _rcu_xchg_pointer #define rcu_publish_content _rcu_publish_content