Version 0.7.17

[userspace-rcu.git] / urcu-qsbr.h

diff --git a/urcu-qsbr.h b/urcu-qsbr.h
index 20dbf47b3aced49cfea55dd9c76e4ad69ed525cb..c1d64fd308a6ddab3c7550911e9031d7e1d6813c 100644 (file)
--- a/urcu-qsbr.h
+++ b/urcu-qsbr.h
@@ -41,7 +41,11 @@
 extern "C" {
 #endif 
 
-#include "urcu/map/urcu-qsbr.h"
+#include <urcu/map/urcu-qsbr.h>
+
+#ifdef RCU_DEBUG       /* For backward compatibility */
+#define DEBUG_RCU
+#endif
 
 /*
  * Important !
@@ -85,12 +89,12 @@ extern "C" {
  * QSBR read lock/unlock are guaranteed to be no-ops. Therefore, we expose them
  * in the LGPL header for any code to use. However, the debug version is not
  * nops and may contain sanity checks. To activate it, applications must be
- * recompiled with -DRCU_DEBUG (even non-LGPL/GPL applications). This is the
+ * recompiled with -DDEBUG_RCU (even non-LGPL/GPL applications). This is the
  * best trade-off between license/performance/code triviality and
  * library debugging & tracing features we could come up with.
  */
 
-#if (!defined(BUILD_QSBR_LIB) && defined(RCU_DEBUG))
+#if (!defined(BUILD_QSBR_LIB) && !defined(DEBUG_RCU))
 
 static inline void rcu_read_lock(void)
 {
@@ -100,12 +104,12 @@ static inline void rcu_read_unlock(void)
 {
 }
 
-#else /* !RCU_DEBUG */
+#else /* !DEBUG_RCU */
 
 extern void rcu_read_lock(void);
 extern void rcu_read_unlock(void);
 
-#endif /* !RCU_DEBUG */
+#endif /* !DEBUG_RCU */
 
 extern void rcu_quiescent_state(void);
 extern void rcu_thread_offline(void);
@@ -125,7 +129,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 */