X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu-bp.h;h=1a1545f2b6e847a1708d8472059d468f95a42d19;hb=2819ef641bb6e2f7aa60c28f3a8f5ad252aa7d00;hp=5e42312e3ff6760b6637e56b08e073c63c3975d5;hpb=aee1715b914e5f4ba5003079d5d954ef2209f04e;p=userspace-rcu.git

diff --git a/urcu-bp.h b/urcu-bp.h
index 5e42312..1a1545f 100644
--- a/urcu-bp.h
+++ b/urcu-bp.h
@@ -92,19 +92,21 @@ extern void rcu_read_unlock(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 +114,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 +125,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);						     \