gcc warning fixes: -Wsign-compare and -Wextra

[urcu.git] / urcu / compiler.h

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 0c6ece252ca0e8bee2a480ab45588bb8ccd15bcd..19534f08522ac3cc28a3557d93f7a16baab6e56e 100644 (file)
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -70,7 +70,7 @@
        })
 
 #define CAA_BUILD_BUG_ON_ZERO(cond) (sizeof(struct { int:-!!(cond); }))
-#define CAA_BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond))
+#define CAA_BUILD_BUG_ON(cond) ((void)CAA_BUILD_BUG_ON_ZERO(cond))
 
 /*
  * __rcu is an annotation that documents RCU pointer accesses that need
@@ -86,9 +86,26 @@
 #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)      \
+               || __GNUC_MAJOR__ >= 5)
+#define CDS_DEPRECATED(msg)    \
+       __attribute__((deprecated(msg)))
+#else
+#define CDS_DEPRECATED(msg)    \
+       __attribute__((deprecated))
+#endif
+
+#define CAA_ARRAY_SIZE(x)      (sizeof(x) / sizeof((x)[0]))
 
 #endif /* _URCU_COMPILER_H */