diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ee4d3d8..dd7183e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,7 @@ elseif(MSVC) set(CMAKE_CXX_FLAGS "-Wall -WX ${MSVC_DISABLED_WARNINGS_STR}") add_definitions(-D_HAS_EXCEPTIONS=0) add_definitions(-DWIN32_LEAN_AND_MEAN) + add_definitions(-DNOMINMAX) endif() if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_C_COMPILER_VERSION VERSION_GREATER "4.7.99") OR diff --git a/tool/digest.cc b/tool/digest.cc index f95f4120..4acf97c8 100644 --- a/tool/digest.cc +++ b/tool/digest.cc @@ -32,7 +32,6 @@ #define O_BINARY 0 #endif #else -#define NOMINMAX #pragma warning(push, 3) #include #pragma warning(pop) diff --git a/tool/transport_common.cc b/tool/transport_common.cc index 9400fe61..8d6013b6 100644 --- a/tool/transport_common.cc +++ b/tool/transport_common.cc @@ -31,7 +31,6 @@ #include #include #else -#define NOMINMAX #include #pragma warning(push, 3) #include