X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-bp.h;h=09ee9c9ddeed6161134fc2d26ad499fde7056202;hp=d92fbd1755047cc8cb446f9ec568d6b332f29a16;hb=848d408839fe4f829db477644c776eba166a0e9a;hpb=4cf1675fa5feb3a2e9e9f965e516e55fbf411457

diff --git a/urcu-bp.h b/urcu-bp.h
index d92fbd1..09ee9c9 100644
--- a/urcu-bp.h
+++ b/urcu-bp.h
@@ -38,7 +38,8 @@
 #include <pthread.h>
 
 /*
- * See urcu-pointer.h and urcu-pointer-static.h for pointer publication headers.
+ * See urcu-pointer.h and urcu/static/urcu-pointer.h for pointer
+ * publication headers.
  */
 #include <urcu-pointer.h>
 
@@ -46,6 +47,8 @@
 extern "C" {
 #endif
 
+#include <urcu/map/urcu-bp.h>
+
 /*
  * Important !
  *
@@ -56,7 +59,7 @@ extern "C" {
 
 #ifdef _LGPL_SOURCE
 
-#include <urcu-bp-static.h>
+#include <urcu/static/urcu-bp.h>
 
 /*
  * Mappings for static use of the userspace RCU library.
@@ -69,14 +72,14 @@ extern "C" {
  *
  * Mark the beginning and end of a read-side critical section.
  */
-#define rcu_read_lock()		_rcu_read_lock()
-#define rcu_read_unlock()	_rcu_read_unlock()
+#define rcu_read_lock_bp		_rcu_read_lock
+#define rcu_read_unlock_bp		_rcu_read_unlock
 
 #else /* !_LGPL_SOURCE */
 
 /*
  * library wrappers to be used by non-LGPL compatible source code.
- * See LGPL-only urcu-pointer-static.h for documentation.
+ * See LGPL-only urcu/static/urcu-pointer.h for documentation.
  */
 
 extern void rcu_read_lock(void);
@@ -115,4 +118,7 @@ static inline void rcu_init(void)
 }
 #endif
 
+#include <urcu-call-rcu.h>
+#include <urcu-defer.h>
+
 #endif /* _URCU_BP_H */