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

[mLib] / utils / macros.h

diff --git a/utils/macros.h b/utils/macros.h
index 02d820e9c5032b2a17852280400c9ae4eed9f127..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,21 +52,6 @@
 
 /* --- 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
-
-#ifdef __clang__
-#  define CLANG_VERSION_P(maj, min)                                    \
-       (__clang_major__ > (maj) || (__clang_major__ == (maj) &&        \
-                                    __clang_minor__ >= (min)))
-#else
-#  define CLANG_VERSION_P(maj, min) 0
-#endif
-
 #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)))