X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu-qsbr.h;h=efa0ec0638fe5bafe13660448bce7322788d7b84;hb=a09d9e1e4714e75eb6b9870036bd1932da82f7c6;hp=75ea14cc0edb8ffa0060c21b1502611704342aad;hpb=d9ce338dd3af50d73744b484d957875e77d4557a;p=userspace-rcu.git

diff --git a/urcu-qsbr.h b/urcu-qsbr.h
index 75ea14c..efa0ec0 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.
@@ -89,7 +90,7 @@ 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)
 {
@@ -124,7 +125,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 */