X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fcompiler.h;h=19534f08522ac3cc28a3557d93f7a16baab6e56e;hp=318ca65911d688a3168fbf3a0b96a845065369a3;hb=4b5f005b03669c2942969e691fc3a0be47b15c57;hpb=706d1165eaa3e58503be043f2545ee697443f5ca

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 318ca65..19534f0 100644
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -86,10 +86,15 @@
 #define URCU_FORCE_CAST(type, arg)	((type) (arg))
 #endif
 
-#define caa_is_signed_type(type)	(((type) (-1)) < 0)
+#define caa_is_signed_type(type)	((type) -1 < (type) 0)
 
-#define caa_cast_long_keep_sign(v)	\
-	(caa_is_signed_type(__typeof__(v)) ? (long) (v) : (unsigned long) (v))
+/*
+ * Sign-extend to long if needed, and output type is unsigned long.
+ */
+#define caa_cast_long_keep_sign(v)		\
+	(caa_is_signed_type(__typeof__(v)) ?	\
+		(unsigned long) (long) (v) :	\
+		(unsigned long) (v))
 
 #if defined (__GNUC__) \
 	&& ((__GNUC_MAJOR__ == 4) && (__GNUC_MINOR__ >= 5)	\
@@ -101,4 +106,6 @@
 	__attribute__((deprecated))
 #endif
 
+#define CAA_ARRAY_SIZE(x)	(sizeof(x) / sizeof((x)[0]))
+
 #endif /* _URCU_COMPILER_H */