Merge branch 'master' into urcu/ht

[urcu.git] / rculfstack.c

diff --git a/rculfstack.c b/rculfstack.c
index 01d549bb9b1b69cbfd9935c1a2fe898a4717c688..4a3041d9712db7bfb78674d674c916a9a50f5324 100644 (file)
--- a/rculfstack.c
+++ b/rculfstack.c
@@ -21,32 +21,35 @@
  */
 
 /* Use the urcu symbols to select the appropriate rcu flavor at link time */
+#define _LGPL_SOURCE
 #include "urcu.h"
+
+#undef _LGPL_SOURCE
 /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
 #include "urcu/rculfstack.h"
-#include "urcu/rculfstack-static.h"
+#include "urcu/static/rculfstack.h"
 
 /*
  * library wrappers to be used by non-LGPL compatible source code.
  */
 
 
-void rcu_lfs_node_init(struct rcu_lfs_node *node)
+void cds_lfs_node_init_rcu(struct cds_lfs_node_rcu *node)
 {
-       _rcu_lfs_node_init(node);
+       _cds_lfs_node_init_rcu(node);
 }
 
-void rcu_lfs_init(struct rcu_lfs_stack *s)
+void cds_lfs_init_rcu(struct cds_lfs_stack_rcu *s)
 {
-       _rcu_lfs_init(s);
+       _cds_lfs_init_rcu(s);
 }
 
-void rcu_lfs_push(struct rcu_lfs_stack *s, struct rcu_lfs_node *node)
+void cds_lfs_push_rcu(struct cds_lfs_stack_rcu *s, struct cds_lfs_node_rcu *node)
 {
-       _rcu_lfs_push(s, node);
+       _cds_lfs_push_rcu(s, node);
 }
 
-struct rcu_lfs_node *rcu_lfs_pop(struct rcu_lfs_stack *s)
+struct cds_lfs_node_rcu *cds_lfs_pop_rcu(struct cds_lfs_stack_rcu *s)
 {
-       return _rcu_lfs_pop(s);
+       return _cds_lfs_pop_rcu(s);
 }