From f4bd64233ae875b6b3315fe4fab279335a6adf2b Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Sat, 18 Jul 2020 17:48:01 +0200 Subject: Build fix with MinGW GCC 9.2.0 (#12084) * Build fix with MinGW GCC 9.2.0 * Fix MinGW tripplets Fixes #12065 * clang-format * Fix unused read_symlink_implementation warning marked as error read_symlink_implementation was used only in copy_symlink_implementation when #if defined(_WIN32) && !VCPKG_USE_STD_FILESYSTEM was true. Removed the warning otherwise. Co-authored-by: JackBoosY --- toolsrc/include/vcpkg/base/system_headers.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg/base/system_headers.h b/toolsrc/include/vcpkg/base/system_headers.h index 858cf58cc..6667fd395 100644 --- a/toolsrc/include/vcpkg/base/system_headers.h +++ b/toolsrc/include/vcpkg/base/system_headers.h @@ -2,8 +2,13 @@ #if defined(_WIN32) +#ifndef NOMINMAX #define NOMINMAX +#endif + +#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN +#endif #pragma warning(suppress : 4768) #include -- cgit v1.2.3