4 files changed, 20 insertions, 10 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/dbg_log.h b/src/utils/dbg_log.h
index d737ff2..08d42a3 100644
--- a/src/utils/dbg_log.h
+++ b/src/utils/dbg_log.h
@@ -7,8 +7,7 @@ void write_wrapper(void (*)(const char *, void *), const char *, ...);
 void
 write_wrapper(void (*write)(const char *, void *), const char *str, ...)
 {
-        static const size_t len = 1000;
-        char message[len];
+        char message[1000];
         va_list args;
 
         va_start(args, str);
diff --git a/src/utils/math.h b/src/utils/math.h
index f2176b6..0c56861 100644
--- a/src/utils/math.h
+++ b/src/utils/math.h
@@ -73,10 +73,10 @@ indextoperm(uint64_t p, size_t n, uint8_t *r)
 
                 /* Find k-th unused number */
                 for (j = 0, c = 0; c <= k; j++)
-                        c += 1 - ((used & (1<<j)) >> j);
+                        c += UINT64_C(1) - ((used & (UINT64_C(1)<<j)) >> j);
 
-                r[i] = j-1;
-                used |= 1 << (j-1);
+                r[i] = (uint8_t)(j-1);
+                used |= UINT64_C(1) << (j-1);
                 p %= factorial[n-i-1];
         }
 
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