utils/macros.h: Sprinkle `__...__' over GCC (and Clang) attribute names.

[mLib] / utils / macros.h

diff --git a/utils/macros.h b/utils/macros.h
index bcceecd..5f432f7 100644 (file)
--- a/utils/macros.h
+++ b/utils/macros.h
@@ -40,7 +40,7 @@
 
 /*----- 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)
@@ -53,20 +53,20 @@
 /* --- Compiler-specific definitions --- */
 
 #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))
+#  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) || CLANG_VERSION_P(3, 3)
-#  define DEPRECATED(msg) __attribute__((deprecated(msg)))
+#  define DEPRECATED(msg) __attribute__((__deprecated__(msg)))
 #elif GCC_VERSION_P(3, 1)
-#  define DEPRECATED(msg) __attribute__((deprecated))
+#  define DEPRECATED(msg) __attribute__((__deprecated__))
 #endif
 
 #if GCC_VERSION_P(4, 0) || CLANG_VERSION_P(3, 3)
-#  define EXECL_LIKE(ntrail) __attribute__((sentinel(ntrail)))
+#  define EXECL_LIKE(ntrail) __attribute__((__sentinel__(ntrail)))
 #endif
 
 #if CLANG_VERSION_P(3, 3)
@@ -180,6 +180,10 @@
 #  define SCANF_LIKE(fmtix, argix)
 #endif
 
+#ifndef NORETURN
+#  define NORETURN
+#endif
+
 #ifndef IGNORABLE
 #  define IGNORABLE
 #endif