From 146dc3afae082d1177068a0e48ca2dc8a92c404a Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sat, 12 Jun 2021 19:15:17 +0200 Subject: Guard #include of "filesystem.hpp" to not break std::min/std::max Based on https://github.com/gulrak/filesystem/issues/128 --- src/dir.cpp | 2 ++ src/fileinfo.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/dir.cpp b/src/dir.cpp index 327bc72..c4fcb1b 100644 --- a/src/dir.cpp +++ b/src/dir.cpp @@ -13,6 +13,8 @@ * */ +#define NOMINMAX +#define WIN32_LEAN_AND_MEAN #include "filesystem.hpp" #include "dir.h" diff --git a/src/fileinfo.cpp b/src/fileinfo.cpp index 8d0a332..7924642 100644 --- a/src/fileinfo.cpp +++ b/src/fileinfo.cpp @@ -13,6 +13,8 @@ * */ +#define NOMINMAX +#define WIN32_LEAN_AND_MEAN // optional #include "filesystem.hpp" #include "fileinfo.h" -- cgit v0.12