From 459502e48ccb6607e531112e7ae89f62b75023c8 Mon Sep 17 00:00:00 2001
From: darkf <lw9k123@gmail.com>
Date: Fri, 28 Nov 2014 21:38:20 -0800
Subject: Fix MinGW build

---
 src/common/common.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/common/common.h')

diff --git a/src/common/common.h b/src/common/common.h
index 9f3016d34..0d7934622 100644
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -50,11 +50,13 @@ private:
 #elif defined _WIN32
 
 // Check MSC ver
-    #if !defined _MSC_VER || _MSC_VER <= 1000
+    #if defined _MSC_VER && _MSC_VER <= 1000
         #error needs at least version 1000 of MSC
     #endif
 
+    #ifndef NOMINMAX
     #define NOMINMAX
+    #endif
 
 // Memory leak checks
     #define CHECK_HEAP_INTEGRITY()
-- 
cgit v1.2.3