X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/ff3d3f01025b881c7cadf093b0f65309c35f2c53..5e80901ea39f40c1763ee64dae80fb0a89210db3:/utils/macros.h

diff --git a/utils/macros.h b/utils/macros.h
index 02d820e..9e27a48 100644
--- a/utils/macros.h
+++ b/utils/macros.h
@@ -32,9 +32,17 @@
   extern "C" {
 #endif
 
+/*----- Header files ------------------------------------------------------*/
+
+#include <assert.h>
+
+#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)
@@ -42,40 +50,32 @@
 #define MLIB__GLUE(x, y) x##y
 #define GLUE(x, y) MLIB__GLUE(x, y)
 
-/*----- Compiler diagnostics ----------------------------------------------*/
-
-/* --- Compiler-specific definitions --- */
-
-#if defined(__GNUC__)
-#  define GCC_VERSION_P(maj, min)					\
-	(__GNUC__ > (maj) || (__GNUC__ == (maj) && __GNUC_MINOR__ >= (min)))
+#ifdef static_assert
+#  define STATIC_ASSERT(cond, msg) static_assert(cond, msg)
 #else
-#  define GCC_VERSION_P(maj, min) 0
+#  define STATIC_ASSERT(cond, msg)					\
+	IGNORABLE extern char static_assert_failed[2*!!(cond) - 1]
 #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
+/*----- Compiler diagnostics ----------------------------------------------*/
+
+/* --- 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)
@@ -189,6 +189,10 @@
 #  define SCANF_LIKE(fmtix, argix)
 #endif
 
+#ifndef NORETURN
+#  define NORETURN
+#endif
+
 #ifndef IGNORABLE
 #  define IGNORABLE
 #endif