diff options
| author | bunnei <bunneidev@gmail.com> | 2014-12-31 05:54:02 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-31 05:54:02 +0100 |
| commit | 29da5da9513c0faae0880d2fced18f80ef89923b (patch) | |
| tree | 9a652fd606e57f322ca07e1468ea3ae83addf6a2 /src/common/common.h | |
| parent | Merge pull request #372 from lioncash/warn (diff) | |
| parent | Fix MSVC-related #defines and add CMakeLists comment (diff) | |
| download | yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.gz yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.bz2 yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.lz yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.xz yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.zst yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.zip | |
Diffstat (limited to 'src/common/common.h')
| -rw-r--r-- | src/common/common.h | 4 |
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() |