X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fmap%2Furcu.h;h=dd7a6914b93f5c2325dae840824b89d1790b2259;hp=90c2f65a79a04096b244bf95692fdeb0213be417;hb=541d828d3101283ccdb1e25fa5a885e1d1743c1a;hpb=4a0b347ad068737b5ab0565cd4506f2f3b21e1f2

diff --git a/urcu/map/urcu.h b/urcu/map/urcu.h
index 90c2f65..dd7a691 100644
--- a/urcu/map/urcu.h
+++ b/urcu/map/urcu.h
@@ -95,17 +95,7 @@
 #define rcu_defer_barrier		rcu_defer_barrier_memb
 #define rcu_defer_barrier_thread	rcu_defer_barrier_thread_memb
 
-/* Concurrent Data Structures */
-#define cds_lfq_node_init_rcu		cds_lfq_node_init_rcu_memb
-#define cds_lfq_init_rcu		cds_lfq_init_rcu_memb
-#define cds_lfq_destroy_rcu		cds_lfq_destroy_rcu_memb
-#define cds_lfq_enqueue_rcu		cds_lfq_enqueue_rcu_memb
-#define cds_lfq_dequeue_rcu		cds_lfq_dequeue_rcu_memb
-
-#define cds_lfs_node_init_rcu		cds_lfs_node_init_rcu_memb
-#define cds_lfs_init_rcu		cds_lfs_init_rcu_memb
-#define cds_lfs_push_rcu		cds_lfs_push_rcu_memb
-#define cds_lfs_pop_rcu			cds_lfs_pop_rcu_memb
+#define rcu_flavor			rcu_flavor_memb
 
 #elif defined(RCU_SIGNAL)
 
@@ -139,17 +129,7 @@
 #define rcu_defer_barrier		rcu_defer_barrier_sig
 #define rcu_defer_barrier_thread	rcu_defer_barrier_thread_sig
 
-/* Concurrent Data Structures */
-#define cds_lfq_node_init_rcu		cds_lfq_node_init_rcu_sig
-#define cds_lfq_init_rcu		cds_lfq_init_rcu_sig
-#define cds_lfq_destroy_rcu		cds_lfq_destroy_rcu_sig
-#define cds_lfq_enqueue_rcu		cds_lfq_enqueue_rcu_sig
-#define cds_lfq_dequeue_rcu		cds_lfq_dequeue_rcu_sig
-
-#define cds_lfs_node_init_rcu		cds_lfs_node_init_rcu_sig
-#define cds_lfs_init_rcu		cds_lfs_init_rcu_sig
-#define cds_lfs_push_rcu		cds_lfs_push_rcu_sig
-#define cds_lfs_pop_rcu			cds_lfs_pop_rcu_sig
+#define rcu_flavor			rcu_flavor_sig
 
 #elif defined(RCU_MB)
 
@@ -183,17 +163,7 @@
 #define rcu_defer_barrier		rcu_defer_barrier_mb
 #define rcu_defer_barrier_thread	rcu_defer_barrier_thread_mb
 
-/* Concurrent Data Structures */
-#define cds_lfq_node_init_rcu		cds_lfq_node_init_rcu_mb
-#define cds_lfq_init_rcu		cds_lfq_init_rcu_mb
-#define cds_lfq_destroy_rcu		cds_lfq_destroy_rcu_mb
-#define cds_lfq_enqueue_rcu		cds_lfq_enqueue_rcu_mb
-#define cds_lfq_dequeue_rcu		cds_lfq_dequeue_rcu_mb
-
-#define cds_lfs_node_init_rcu		cds_lfs_node_init_rcu_mb
-#define cds_lfs_init_rcu		cds_lfs_init_rcu_mb
-#define cds_lfs_push_rcu		cds_lfs_push_rcu_mb
-#define cds_lfs_pop_rcu			cds_lfs_pop_rcu_mb
+#define rcu_flavor			rcu_flavor_mb
 
 #else