utils/macros.h (N): Properly parenthesize the argument.

[mLib] / utils / macros.h

diff --git a/utils/macros.h b/utils/macros.h
index 35ececf70639ad255d01bd2f36a33f75ee3eeb8a..8f9f49e8d0ef4a51c5f2cf778a717076ee3fed1d 100644 (file)
--- a/utils/macros.h
+++ b/utils/macros.h
@@ -32,9 +32,15 @@
   extern "C" {
 #endif
 
+/*----- Header files ------------------------------------------------------*/
+
+#ifndef MLIB_COMPILER_H
+#  include "compiler.h"
+#endif
+
 /*----- Miscellaneous utility macros --------------------------------------*/
 
-#define N(v) (sizeof(v)/sizeof(*v))
+#define N(v) (sizeof(v)/sizeof(*(v)))
 
 #define MLIB__STR(x) #x
 #define STR(x) MLIB__STR(x)
@@ -46,31 +52,41 @@
 
 /* --- Compiler-specific definitions --- */
 
-#if defined(__GNUC__)
-#  define GCC_VERSION_P(maj, min)                                      \
-       (__GNUC__ > (maj) || (__GNUC__ == (maj) && __GNUC_MINOR__ >= (min)))
-#else
-#  define GCC_VERSION_P(maj, min) 0
-#endif
-
-#if GCC_VERSION_P(2, 5)
+#if GCC_VERSION_P(2, 5) || CLANG_VERSION_P(3, 3)
 #  define NORETURN __attribute__((noreturn))
 #  define PRINTF_LIKE(fix, aix) __attribute__((format(printf, fix, aix)))
 #  define SCANF_LIKE(fix, aix) __attribute__((format(scanf, fix, aix)))
 #  define IGNORABLE __attribute__((unused))
 #endif
 
-#if GCC_VERSION_P(4, 5)
+#if GCC_VERSION_P(4, 5) || CLANG_VERSION_P(3, 3)
 #  define DEPRECATED(msg) __attribute__((deprecated(msg)))
 #elif GCC_VERSION_P(3, 1)
 #  define DEPRECATED(msg) __attribute__((deprecated))
 #endif
 
-#if GCC_VERSION_P(4, 0)
+#if GCC_VERSION_P(4, 0) || CLANG_VERSION_P(3, 3)
 #  define EXECL_LIKE(ntrail) __attribute__((sentinel(ntrail)))
 #endif
 
-#if GCC_VERSION_P(4, 6)
+#if CLANG_VERSION_P(3, 3)
+
+#  define MLIB__PRAGMA_HACK(x) _Pragma(#x)
+#  define MLIB__MUFFLE_WARNINGS(warns, body)                           \
+       _Pragma("clang diagnostic push")                                \
+       warns                                                           \
+       body                                                            \
+       _Pragma("clang diagnostic pop")
+#  define CLANG_WARNING(warn)                                          \
+       MLIB__PRAGMA_HACK(clang diagnostic ignored warn)
+#  define MUFFLE_WARNINGS_DECL(warns, body)                            \
+       MLIB__MUFFLE_WARNINGS(warns, body)
+#  define MUFFLE_WARNINGS_EXPR(warns, body)                            \
+       __extension__ ({ MLIB__MUFFLE_WARNINGS(warns, (body);) })
+#  define MUFFLE_WARNINGS_STMT(warns, body)                            \
+       do { MLIB__MUFFLE_WARNINGS(warns, body) } while (0)
+
+#elif GCC_VERSION_P(4, 6)
 
    /* --- Diagnostic suppression in GCC: a tale of woe --- *
     *
@@ -172,6 +188,10 @@
 #  define GCC_WARNING(warn)
 #endif
 
+#ifndef CLANG_WARNING
+#  define CLANG_WARNING(warn)
+#endif
+
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus