X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fcompiler.h;h=974885a73f36c08e322bb6606bb3cd0e8e964ddd;hp=08bd9e9f44fa004a744f98d1734a5131bc670428;hb=bdffa73aa208ad5f1e5b3a3cb6cbf86ac6996559;hpb=3282a76b46b74a92809292fa63ba671de9ad88eb

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 08bd9e9..974885a 100644
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -38,7 +38,7 @@
  * use is to mediate communication between process-level code and irq/NMI
  * handlers, all running on the same CPU.
  */
-#define CMM_ACCESS_ONCE(x)	(*(volatile typeof(x) *)&(x))
+#define CMM_ACCESS_ONCE(x)	(*(volatile __typeof__(x) *)&(x))
 
 #ifndef caa_max
 #define caa_max(a,b) ((a)>(b)?(a):(b))
@@ -65,7 +65,7 @@
  */
 #define caa_container_of(ptr, type, member)				\
 	({								\
-		const typeof(((type *) NULL)->member) * __ptr = (ptr);	\
+		const __typeof__(((type *) NULL)->member) * __ptr = (ptr); \
 		(type *)((char *)__ptr - offsetof(type, member));	\
 	})
 
@@ -86,4 +86,9 @@
 #define URCU_FORCE_CAST(type, arg)	((type) (arg))
 #endif
 
+#define caa_is_signed_type(type)	(((type) (-1)) < 0)
+
+#define caa_cast_long_keep_sign(v)	\
+	(caa_is_signed_type(__typeof__(v)) ? (long) (v) : (unsigned long) (v))
+
 #endif /* _URCU_COMPILER_H */