X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-pointer.h;h=dd64ec4128fadb2f7b39971a0d975c891c0a6013;hp=7b240a783d3ed45d7af6d4c5ee1ad83781b30762;hb=a641253675b6005329234c0c7354b88dea7a4245;hpb=6982d6d71aeed16d2d929bd0ed221e8f444b706e

diff --git a/urcu-pointer.h b/urcu-pointer.h
index 7b240a7..dd64ec4 100644
--- a/urcu-pointer.h
+++ b/urcu-pointer.h
@@ -28,7 +28,7 @@
 
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
-#include <urcu/uatomic_arch.h>
+#include <urcu/uatomic.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,7 +36,7 @@ extern "C" {
 
 #ifdef _LGPL_SOURCE
 
-#include <urcu-pointer-static.h>
+#include <urcu/static/urcu-pointer.h>
 
 /*
  * rcu_dereference(ptr)
@@ -67,37 +67,41 @@ extern "C" {
 extern void *rcu_dereference_sym(void *p);
 #define rcu_dereference(p)						     \
 	({								     \
-		typeof(p) _________p1 =					     \
-			rcu_dereference_sym((void *)(p));		     \
+		typeof(p) _________p1 =	URCU_FORCE_CAST(typeof(p),	     \
+			rcu_dereference_sym(URCU_FORCE_CAST(void *, p)));    \
 		(_________p1);						     \
 	})
 
 extern void *rcu_cmpxchg_pointer_sym(void **p, void *old, void *_new);
 #define rcu_cmpxchg_pointer(p, old, _new)				     \
 	({								     \
-		typeof(*p) _________pold = (old);			     \
-		typeof(*p) _________pnew = (_new);			     \
-		typeof(*p) _________p1 =				     \
-			rcu_cmpxchg_pointer_sym((void **)(p), _________pold, \
-						_________pnew);		     \
+		typeof(*(p)) _________pold = (old);			     \
+		typeof(*(p)) _________pnew = (_new);			     \
+		typeof(*(p)) _________p1 = URCU_FORCE_CAST(typeof(*(p)),     \
+			rcu_cmpxchg_pointer_sym(URCU_FORCE_CAST(void **, p),\
+						_________pold,		     \
+						_________pnew));	     \
 		(_________p1);						     \
 	})
 
 extern void *rcu_xchg_pointer_sym(void **p, void *v);
 #define rcu_xchg_pointer(p, v)						     \
 	({								     \
-		typeof(*p) _________pv = (v);			             \
-		typeof(*p) _________p1 =				     \
-			rcu_xchg_pointer_sym((void **)(p), _________pv);     \
+		typeof(*(p)) _________pv = (v);			             \
+		typeof(*(p)) _________p1 = URCU_FORCE_CAST(typeof(*(p)),     \
+			rcu_xchg_pointer_sym(URCU_FORCE_CAST(void **, p),    \
+					     _________pv));		     \
 		(_________p1);						     \
 	})
 
 extern void *rcu_set_pointer_sym(void **p, void *v);
 #define rcu_set_pointer(p, v)						     \
 	({								     \
-		typeof(*p) _________pv = (v);			             \
-		typeof(*p) _________p1 =				     \
-			rcu_set_pointer_sym((void **)(p), _________pv);	     \
+		typeof(*(p)) _________pv = (v);			             \
+		typeof(*(p)) _________p1 = URCU_FORCE_CAST(typeof(*(p)),     \
+			rcu_set_pointer_sym(URCU_FORCE_CAST(void **, p),     \
+					    _________pv));		     \
+		(_________p1);						     \
 	})
 
 #endif /* !_LGPL_SOURCE */