X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-bp.h;h=7a265dc5f91b1899ef35a73d31eb7782d4d2e5a3;hp=28531c942e27eb17713243ba0181b3ce69d7a524;hb=2af1c19e6a553878fcb2a5106f050d5ed7ac0f54;hpb=125ea9db85e434dfb5f9753ea37997bb9ae4fce8

diff --git a/urcu-bp.h b/urcu-bp.h
index 28531c9..7a265dc 100644
--- a/urcu-bp.h
+++ b/urcu-bp.h
@@ -74,6 +74,7 @@ extern "C" {
  */
 #define rcu_read_lock_bp		_rcu_read_lock
 #define rcu_read_unlock_bp		_rcu_read_unlock
+#define rcu_read_ongoing_bp		_rcu_read_ongoing
 
 #define rcu_dereference_bp		rcu_dereference
 #define rcu_cmpxchg_pointer_bp		rcu_cmpxchg_pointer
@@ -89,22 +90,25 @@ extern "C" {
 
 extern void rcu_read_lock(void);
 extern void rcu_read_unlock(void);
+extern int rcu_read_ongoing(void);
 
 extern void *rcu_dereference_sym_bp(void *p);
 #define rcu_dereference_bp(p)						     \
+	__extension__							     \
 	({								     \
-		typeof(p) _________p1 =	URCU_FORCE_CAST(typeof(p),	     \
+		__typeof__(p) _________p1 = URCU_FORCE_CAST(__typeof__(p),   \
 			rcu_dereference_sym_bp(URCU_FORCE_CAST(void *, p))); \
 		(_________p1);						     \
 	})
 
 extern void *rcu_cmpxchg_pointer_sym_bp(void **p, void *old, void *_new);
 #define rcu_cmpxchg_pointer_bp(p, old, _new)				     \
+	__extension__							     \
 	({								     \
-		typeof(*(p)) _________pold = (old);			     \
-		typeof(*(p)) _________pnew = (_new);			     \
-		typeof(*(p)) _________p1 = URCU_FORCE_CAST(typeof(*(p)),     \
-			rcu_cmpxchg_pointer_sym_bp(URCU_FORCE_CAST(void **, p),\
+		__typeof__(*(p)) _________pold = (old);			     \
+		__typeof__(*(p)) _________pnew = (_new);		     \
+		__typeof__(*(p)) _________p1 = URCU_FORCE_CAST(__typeof__(*(p)), \
+			rcu_cmpxchg_pointer_sym_bp(URCU_FORCE_CAST(void **, p), \
 						_________pold,		     \
 						_________pnew));	     \
 		(_________p1);						     \
@@ -112,9 +116,10 @@ extern void *rcu_cmpxchg_pointer_sym_bp(void **p, void *old, void *_new);
 
 extern void *rcu_xchg_pointer_sym_bp(void **p, void *v);
 #define rcu_xchg_pointer_bp(p, v)					     \
+	__extension__							     \
 	({								     \
-		typeof(*(p)) _________pv = (v);			             \
-		typeof(*(p)) _________p1 = URCU_FORCE_CAST(typeof(*(p)),     \
+		__typeof__(*(p)) _________pv = (v);			     \
+		__typeof__(*(p)) _________p1 = URCU_FORCE_CAST(__typeof__(*(p)),\
 			rcu_xchg_pointer_sym_bp(URCU_FORCE_CAST(void **, p), \
 					     _________pv));		     \
 		(_________p1);						     \
@@ -122,9 +127,10 @@ extern void *rcu_xchg_pointer_sym_bp(void **p, void *v);
 
 extern void *rcu_set_pointer_sym_bp(void **p, void *v);
 #define rcu_set_pointer_bp(p, v)					     \
+	__extension__							     \
 	({								     \
-		typeof(*(p)) _________pv = (v);			             \
-		typeof(*(p)) _________p1 = URCU_FORCE_CAST(typeof(*(p)),     \
+		__typeof__(*(p)) _________pv = (v);			     \
+		__typeof__(*(p)) _________p1 = URCU_FORCE_CAST(__typeof__(*(p)), \
 			rcu_set_pointer_sym_bp(URCU_FORCE_CAST(void **, p),  \
 					    _________pv));		     \
 		(_________p1);						     \
@@ -174,11 +180,12 @@ static inline void rcu_thread_online(void)
 {
 }
 
-#ifdef __cplusplus 
+#ifdef __cplusplus
 }
 #endif
 
 #include <urcu-call-rcu.h>
 #include <urcu-defer.h>
+#include <urcu-flavor.h>
 
 #endif /* _URCU_BP_H */