Use macro for [static N]

2 files changed, 16 insertions, 5 deletions

diff --git a/src/utils/compilers.h b/src/utils/compilers.h
index a7d6df5..1b175bb 100644
--- a/src/utils/compilers.h
+++ b/src/utils/compilers.h
@@ -1,13 +1,24 @@
 #if defined(__GNUC__)
 
-#define unused __attribute__((unused))
+#define UNUSED __attribute__((unused))
+#define SIZE(x) static (x)
+#define NON_NULL SIZE(1)
 
 #elif defined(__clang__)
 
-#define unused __attribute__((unused))
+#define UNUSED __attribute__((unused))
+#define SIZE(x) static (x)
+#define NON_NULL SIZE(1)
 
 #else
 
-#define unused
+/*
+For example MSVC, which is not fully C11 compliant (e.g. it does not support
+a[static N] notation for array parameters).
+*/
+
+#define UNUSED
+#define SIZE(x)
+#define NON_NULL
 
 #endif
diff --git a/src/utils/wrapthread.h b/src/utils/wrapthread.h
index 4ac72a6..9578293 100644
--- a/src/utils/wrapthread.h
+++ b/src/utils/wrapthread.h
@@ -61,8 +61,8 @@
         #define wrapthread_return_t int
         #define wrapthread_return_val 0
 
-        #define wrapthread_define_var_thread_t(x) unused char x
-        #define wrapthread_define_var_mutex_t(x) unused char x
+        #define wrapthread_define_var_thread_t(x) UNUSED char x
+        #define wrapthread_define_var_mutex_t(x) UNUSED char x
         #define wrapthread_define_struct_thread_t(x) char x
         #define wrapthread_define_struct_mutex_t(x) char x