Merge branch 'master' of tronto.net:nissy-core into windows

4 files changed, 19 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 1611bcc..38d22f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,6 @@ tools/results
 *.s
 *.pyd
 *.dll
+*.exp
+*.lib
+*.pdb
diff --git a/src/utils/compilers.h b/src/utils/compilers.h
new file mode 100644
index 0000000..a7d6df5
--- /dev/null
+++ b/src/utils/compilers.h
@@ -0,0 +1,13 @@
+#if defined(__GNUC__)
+
+#define unused __attribute__((unused))
+
+#elif defined(__clang__)
+
+#define unused __attribute__((unused))
+
+#else
+
+#define unused
+
+#endif
diff --git a/src/utils/utils.h b/src/utils/utils.h
index b2ab64d..383781a 100644
--- a/src/utils/utils.h
+++ b/src/utils/utils.h
@@ -1,3 +1,4 @@
+#include "compilers.h"
 #include "dbg_log.h"
 #include "constants.h"
 #include "math.h"
diff --git a/src/utils/wrapthread.h b/src/utils/wrapthread.h
index 482b67f..28654fe 100644
--- a/src/utils/wrapthread.h
+++ b/src/utils/wrapthread.h
@@ -2,8 +2,8 @@
 
 #define wrapthread_atomic
 
-#define wrapthread_define_var_thread_t(x) char x; (void)(x)
-#define wrapthread_define_var_mutex_t(x) char x; (void)(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