Merge branch 'master' into urcu/ht

[urcu.git] / urcu / wfstack.h

diff --git a/urcu/wfstack.h b/urcu/wfstack.h
index 6cb4971c929c63f02d231ac1fbd6e15550784299..354646dfb4237bf626478d2291de52bb2f47fbf1 100644 (file)
--- a/urcu/wfstack.h
+++ b/urcu/wfstack.h
@@ -31,33 +31,33 @@
 extern "C" {
 #endif
 
-struct wfs_node {
-       struct wfs_node *next;
+struct cds_wfs_node {
+       struct cds_wfs_node *next;
 };
 
-struct wfs_stack {
-       struct wfs_node *head;
+struct cds_wfs_stack {
+       struct cds_wfs_node *head;
        pthread_mutex_t lock;
 };
 
 #ifdef _LGPL_SOURCE
 
-#include <urcu/wfstack-static.h>
+#include <urcu/static/wfstack.h>
 
-#define wfs_node_init          _wfs_node_init
-#define wfs_init               _wfs_init
-#define wfs_push               _wfs_push
-#define __wfs_pop_blocking     ___wfs_pop_blocking
-#define wfs_pop_blocking       _wfs_pop_blocking
+#define cds_wfs_node_init              _cds_wfs_node_init
+#define cds_wfs_init           _cds_wfs_init
+#define cds_wfs_push           _cds_wfs_push
+#define __cds_wfs_pop_blocking ___cds_wfs_pop_blocking
+#define cds_wfs_pop_blocking   _cds_wfs_pop_blocking
 
 #else /* !_LGPL_SOURCE */
 
-extern void wfs_node_init(struct wfs_node *node);
-extern void wfs_init(struct wfs_stack *s);
-extern void wfs_push(struct wfs_stack *s, struct wfs_node *node);
-/* __wfs_pop_blocking: caller ensures mutual exclusion between pops */
-extern struct wfs_node *__wfs_pop_blocking(struct wfs_stack *s);
-extern struct wfs_node *wfs_pop_blocking(struct wfs_stack *s);
+extern void cds_wfs_node_init(struct cds_wfs_node *node);
+extern void cds_wfs_init(struct cds_wfs_stack *s);
+extern void cds_wfs_push(struct cds_wfs_stack *s, struct cds_wfs_node *node);
+/* __cds_wfs_pop_blocking: caller ensures mutual exclusion between pops */
+extern struct cds_wfs_node *__cds_wfs_pop_blocking(struct cds_wfs_stack *s);
+extern struct cds_wfs_node *cds_wfs_pop_blocking(struct cds_wfs_stack *s);
 
 #endif /* !_LGPL_SOURCE */