X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/blobdiff_plain/ff3d3f01025b881c7cadf093b0f65309c35f2c53..2eea69731acfd2491d67e84edaa078f24c48c96b:/utils/macros.h

diff --git a/utils/macros.h b/utils/macros.h
index 02d820e..5f432f7 100644
--- 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,36 +52,21 @@
 
 /* --- 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)))
-#  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)
@@ -189,6 +180,10 @@
 #  define SCANF_LIKE(fmtix, argix)
 #endif
 
+#ifndef NORETURN
+#  define NORETURN
+#endif
+
 #ifndef IGNORABLE
 #  define IGNORABLE
 #endif