Fix Windows warnings-as-errors introduced by ref-awmodule

leapmotion · Aug 21, 2014 · 0fbd709 · 0fbd709
1 parent 2bb1328
commit 0fbd709
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/autonet/stdafx.h b/src/autonet/stdafx.h
@@ -3,7 +3,9 @@
 #include <math.h>
 #include <assert.h>
 #include <cctype>
-#define NOMINMAX
+#ifndef NOMINMAX
+  #define NOMINMAX
+#endif
 
 #ifndef _MSC_VER
   #include <stdlib.h>

diff --git a/src/autotesting/stdafx.h b/src/autotesting/stdafx.h
@@ -5,7 +5,9 @@
 // Currently this is only supported on MSVC
 #ifdef _MSC_VER
   #include <thread>
-  #define NOMINMAX
+  #ifndef NOMINMAX
+    #define NOMINMAX
+  #endif
 #endif
 
 #ifndef _MSC_VER
@@ -18,4 +20,4 @@
 
 template<class T, int n>
 const char(&ArraySize(const T(&vals)[n]))[n];
-#define ARRAYCOUNT(x) sizeof(ArraySize(x))
+#define ARRAYCOUNT(x) sizeof(ArraySize(x))
diff --git a/src/autowiring/stdafx.h b/src/autowiring/stdafx.h
@@ -5,7 +5,9 @@
 // Currently this is only supported on MSVC
 #ifdef _MSC_VER
   #include <thread>
-  #define NOMINMAX
+  #ifndef NOMINMAX
+    #define NOMINMAX
+  #endif
 #endif
 
 #ifndef _MSC_VER