diff options
| author | Cristian Adam <cristian.adam@gmail.com> | 2020-07-18 17:48:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-18 08:48:01 -0700 |
| commit | f4bd64233ae875b6b3315fe4fab279335a6adf2b (patch) | |
| tree | 76203f90a07094662dfffd4f90f383f0a4559c0b /toolsrc/include | |
| parent | 751fc627ef4f1c319b04e1c364e24b4da965e273 (diff) | |
| download | vcpkg-f4bd64233ae875b6b3315fe4fab279335a6adf2b.tar.gz vcpkg-f4bd64233ae875b6b3315fe4fab279335a6adf2b.zip | |
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 <yuzaiyang@beyondsoft.com>
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/base/system_headers.h | 5 |
1 files changed, 5 insertions, 0 deletions
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 <windows.h> |