X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-qsbr.h;h=b4a28a78a6a84490611f1a12277197f4a02092d6;hp=a691c521db16441091abd177884cfca94bc5af23;hb=d47b05cb05b91bb9679d127c51bc4beac12b899d;hpb=0376e7b2f8d26778ebc4750b34e718c062c92764

diff --git a/urcu-qsbr.h b/urcu-qsbr.h
index a691c52..b4a28a7 100644
--- a/urcu-qsbr.h
+++ b/urcu-qsbr.h
@@ -32,7 +32,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>
 
@@ -40,7 +41,7 @@
 extern "C" {
 #endif 
 
-#include "urcu-qsbr-map.h"
+#include <urcu/map/urcu-qsbr.h>
 
 /*
  * Important !
@@ -52,7 +53,7 @@ extern "C" {
 
 #ifdef _LGPL_SOURCE
 
-#include <urcu-qsbr-static.h>
+#include <urcu/static/urcu-qsbr.h>
 
 /*
  * Mappings for static use of the userspace RCU library.
@@ -69,6 +70,7 @@ extern "C" {
  */
 #define rcu_read_lock_qsbr		_rcu_read_lock
 #define rcu_read_unlock_qsbr		_rcu_read_unlock
+#define rcu_read_ongoing_qsbr		_rcu_read_ongoing
 
 #define rcu_quiescent_state_qsbr	_rcu_quiescent_state
 #define rcu_thread_offline_qsbr		_rcu_thread_offline
@@ -89,13 +91,13 @@ extern "C" {
  * library debugging & tracing features we could come up with.
  */
 
-#if (!defined(BUILD_QSBR_LIB) && defined(RCU_DEBUG))
+#if (!defined(BUILD_QSBR_LIB) && !defined(RCU_DEBUG))
 
 static inline void rcu_read_lock(void)
 {
 }
 
-static inline void rcu_read_lock(void)
+static inline void rcu_read_unlock(void)
 {
 }
 
@@ -106,6 +108,7 @@ extern void rcu_read_unlock(void);
 
 #endif /* !RCU_DEBUG */
 
+extern int rcu_read_ongoing(void);
 extern void rcu_quiescent_state(void);
 extern void rcu_thread_offline(void);
 extern void rcu_thread_online(void);
@@ -124,7 +127,8 @@ extern void rcu_unregister_thread(void);
 }
 #endif
 
-#include "urcu-call-rcu.h"
-#include "urcu-defer.h"
+#include <urcu-call-rcu.h>
+#include <urcu-defer.h>
+#include <urcu-flavor.h>
 
 #endif /* _URCU_QSBR_H */