X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-bp.h;h=09ee9c9ddeed6161134fc2d26ad499fde7056202;hp=fdf885c71113d2f4add67ba4354d00bfd20fcfa7;hb=3eca1b8cce5630bcbd865a8d30855c996bc021c3;hpb=5e77fc1f94c3572fca067d37667d74f8165e2434

diff --git a/urcu-bp.h b/urcu-bp.h
index fdf885c..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,7 +47,7 @@
 extern "C" {
 #endif
 
-#include "urcu-bp-map.h"
+#include <urcu/map/urcu-bp.h>
 
 /*
  * Important !
@@ -58,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.
@@ -71,14 +72,14 @@ extern "C" {
  *
  * Mark the beginning and end of a read-side critical section.
  */
-#define rcu_read_lock_bp()		_rcu_read_lock()
-#define rcu_read_unlock_bp()		_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);
@@ -117,6 +118,7 @@ static inline void rcu_init(void)
 }
 #endif
 
-#include "urcu-call-rcu.h"
+#include <urcu-call-rcu.h>
+#include <urcu-defer.h>
 
 #endif /* _URCU_BP_H */