X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fcompiler.h;h=511dbdf302456d46329bce98e1147b7c34a51543;hp=1e309035a9313e1540ada18c95b1da4d444c399b;hb=1a186a881c195c0f240c0baa813056b0cc1eab91;hpb=4b79310aa3d408ba30fee02cc497a68072d38a99

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 1e30903..511dbdf 100644
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -64,6 +64,7 @@
  * @member: name of the field within the object.
  */
 #define caa_container_of(ptr, type, member)				\
+	__extension__							\
 	({								\
 		const __typeof__(((type *) NULL)->member) * __ptr = (ptr); \
 		(type *)((char *)__ptr - offsetof(type, member));	\
@@ -89,16 +90,15 @@
 #define caa_is_signed_type(type)	((type) -1 < (type) 0)
 
 /*
- * Sign-extend to long if needed, and output type is unsigned long.
+ * Cast to unsigned long, sign-extending if @v is signed.
+ * Note: casting to a larger type or to same type size keeps the sign of
+ * the expression being cast (see C99 6.3.1.3).
  */
-#define caa_cast_long_keep_sign(v)		\
-	(caa_is_signed_type(__typeof__(v)) ?	\
-		(unsigned long) (long) (v) :	\
-		(unsigned long) (v))
+#define caa_cast_long_keep_sign(v)	((unsigned long) (v))
 
 #if defined (__GNUC__) \
-	&& ((__GNUC_MAJOR__ == 4) && (__GNUC_MINOR__ >= 5)	\
-		|| __GNUC_MAJOR__ >= 5)
+	&& ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)	\
+		|| __GNUC__ >= 5)
 #define CDS_DEPRECATED(msg)	\
 	__attribute__((deprecated(msg)))
 #else