X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu.h;h=d4c87535d27caaac96111b946305454d884a676f;hp=00d9b757ee628ba69c4c294a20f4f842be1a932f;hb=1b9119f8d4c3f40a61d4ee5403f0e7e5967c33d8;hpb=5e77fc1f94c3572fca067d37667d74f8165e2434

diff --git a/urcu.h b/urcu.h
index 00d9b75..d4c8753 100644
--- a/urcu.h
+++ b/urcu.h
@@ -35,7 +35,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>
 
@@ -43,7 +44,7 @@
 extern "C" {
 #endif 
 
-#include "urcu-map.h"
+#include "urcu/map/urcu.h"
 
 /*
  * Important !
@@ -55,7 +56,7 @@ extern "C" {
 
 #ifdef _LGPL_SOURCE
 
-#include <urcu-static.h>
+#include <urcu/static/urcu.h>
 
 /*
  * Mappings for static use of the userspace RCU library.
@@ -71,21 +72,21 @@ extern "C" {
  * READ-SIDE CRITICAL SECTION.
  */
 #ifdef RCU_MEMBARRIER
-#define rcu_read_lock_memb()		_rcu_read_lock()
-#define rcu_read_unlock_memb()		_rcu_read_unlock()
+#define rcu_read_lock_memb		_rcu_read_lock
+#define rcu_read_unlock_memb		_rcu_read_unlock
 #elif defined(RCU_SIGNAL)
-#define rcu_read_lock_sig()		_rcu_read_lock()
-#define rcu_read_unlock_sig()		_rcu_read_unlock()
+#define rcu_read_lock_sig		_rcu_read_lock
+#define rcu_read_unlock_sig		_rcu_read_unlock
 #elif defined(RCU_MB)
-#define rcu_read_lock_mb()		_rcu_read_lock()
-#define rcu_read_unlock_mb()		_rcu_read_unlock()
+#define rcu_read_lock_mb		_rcu_read_lock
+#define rcu_read_unlock_mb		_rcu_read_unlock
 #endif
 
 #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);
@@ -111,5 +112,6 @@ extern void rcu_init(void);
 #endif
 
 #include "urcu-call-rcu.h"
+#include "urcu-defer.h"
 
 #endif /* _URCU_H */