X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-pointer-static.h;fp=urcu-pointer-static.h;h=0a01f1ffc944550d3c66cdf9b8d5a53c2a5c8225;hp=06b8881a5ad3d1549f93f48ee977d1efde4a93d6;hb=2b5554c9169ea1ef93dffacb7671a00f9e7de511;hpb=2ff1db4a7825af40f327413305de6f9955af0e35

diff --git a/urcu-pointer-static.h b/urcu-pointer-static.h
index 06b8881..0a01f1f 100644
--- a/urcu-pointer-static.h
+++ b/urcu-pointer-static.h
@@ -71,12 +71,14 @@
  * should not be freed !).
  */
 
-#define _rcu_cmpxchg_pointer(p, old, _new)		\
-	({						\
-		if (!__builtin_constant_p(_new) ||	\
-		    ((_new) != NULL))			\
-			wmb();				\
-		uatomic_cmpxchg(p, old, _new);		\
+#define _rcu_cmpxchg_pointer(p, old, _new)				\
+	({								\
+		typeof(*p) _________pold = (old);			\
+		typeof(*p) _________pnew = (_new);			\
+		if (!__builtin_constant_p(_new) ||			\
+		    ((_new) != NULL))					\
+			wmb();						\
+		uatomic_cmpxchg(p, _________pold, _________pnew);	\
 	})
 
 /**
@@ -87,19 +89,21 @@
 
 #define _rcu_xchg_pointer(p, v)				\
 	({						\
+		typeof(*p) _________pv = (v);		\
 		if (!__builtin_constant_p(v) ||		\
 		    ((v) != NULL))			\
 			wmb();				\
-		uatomic_xchg(p, v);			\
+		uatomic_xchg(p, _________pv);		\
 	})
 
 
 #define _rcu_set_pointer(p, v)				\
 	({						\
+		typeof(*p) _________pv = (v);		\
 		if (!__builtin_constant_p(v) || 	\
 		    ((v) != NULL))			\
 			wmb();				\
-		STORE_SHARED(*(p), v);			\
+		STORE_SHARED(*(p), _________pv);	\
 	})
 
 /**