summaryrefslogtreecommitdiffstats
path: root/src/common/common.h
diff options
context:
space:
mode:
authordarkf <lw9k123@gmail.com>2014-11-29 06:38:20 +0100
committerdarkf <lw9k123@gmail.com>2014-11-29 06:38:20 +0100
commit459502e48ccb6607e531112e7ae89f62b75023c8 (patch)
tree491c2a24f1496d4abab0d3339e559b9facc74265 /src/common/common.h
parentMerge pull request #223 from linkmauve/remove-thread (diff)
downloadyuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar
yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.gz
yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.bz2
yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.lz
yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.xz
yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.tar.zst
yuzu-459502e48ccb6607e531112e7ae89f62b75023c8.zip
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 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()