summaryrefslogtreecommitdiff
path: root/src/common/common.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-12-30 23:54:02 -0500
committerbunnei <bunneidev@gmail.com>2014-12-30 23:54:02 -0500
commit29da5da9513c0faae0880d2fced18f80ef89923b (patch)
tree9a652fd606e57f322ca07e1468ea3ae83addf6a2 /src/common/common.h
parent74d7b45d09c172bdb6dce665903537a784acb110 (diff)
parent5d10b212ecebb15fb1463edc08c725d8e29fa44a (diff)
Merge pull request #369 from darkf/mingw_
Fix MinGW build (2)
Diffstat (limited to 'src/common/common.h')
-rw-r--r--src/common/common.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/common.h b/src/common/common.h
index 66f0ccd0c..ba33373ae 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()