X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-bp.h;fp=urcu-bp.h;h=833688f7b553089deb21e7a32187bb83d5b5fdf3;hp=5e42312e3ff6760b6637e56b08e073c63c3975d5;hb=bdffa73aa208ad5f1e5b3a3cb6cbf86ac6996559;hpb=665eb3efcc4557deddb70ecce68ec3b918ae9c5e

diff --git a/urcu-bp.h b/urcu-bp.h
index 5e42312..833688f 100644
--- a/urcu-bp.h
+++ b/urcu-bp.h
@@ -93,7 +93,7 @@ extern void rcu_read_unlock(void);
 extern void *rcu_dereference_sym_bp(void *p);
 #define rcu_dereference_bp(p)						     \
 	({								     \
-		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);						     \
 	})
@@ -101,10 +101,10 @@ extern void *rcu_dereference_sym_bp(void *p);
 extern void *rcu_cmpxchg_pointer_sym_bp(void **p, void *old, void *_new);
 #define rcu_cmpxchg_pointer_bp(p, old, _new)				     \
 	({								     \
-		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);						     \
@@ -113,8 +113,8 @@ 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)					     \
 	({								     \
-		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);						     \
@@ -123,8 +123,8 @@ 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)					     \
 	({								     \
-		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);						     \