summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2021-06-12 17:15:17 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2021-06-12 17:15:17 (GMT)
commit146dc3afae082d1177068a0e48ca2dc8a92c404a (patch)
treece9708bf79c83f5a0086f191ddc25e04ebd56c7a
parent046c0449990e00671497d00c7e103ce6b6080c28 (diff)
downloadDoxygen-146dc3afae082d1177068a0e48ca2dc8a92c404a.zip
Doxygen-146dc3afae082d1177068a0e48ca2dc8a92c404a.tar.gz
Doxygen-146dc3afae082d1177068a0e48ca2dc8a92c404a.tar.bz2
Guard #include of "filesystem.hpp" to not break std::min/std::max
Based on https://github.com/gulrak/filesystem/issues/128
-rw-r--r--src/dir.cpp2
-rw-r--r--src/fileinfo.cpp2
2 files changed, 4 insertions, 0 deletions
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"