Follow-up, get rid of even more NOMINMAX warnings

2025-08-11 17:18:59 +08:00 · 2023-08-16 14:15:38 +02:00 · 2023-08-16 14:15:38 +02:00 · c613669718
commit c613669718
parent bd31722bac
3 changed files with 7 additions and 0 deletions
--- a/src/libslic3r/GCode/PostProcessor.cpp
+++ b/src/libslic3r/GCode/PostProcessor.cpp
@ -16,7 +16,9 @@

 // The standard Windows includes.
 #define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <Windows.h>
 #include <shellapi.h>

--- a/src/libslic3r/Preset.cpp
+++ b/src/libslic3r/Preset.cpp
@ -7,7 +7,9 @@

 #ifdef _MSC_VER
    #define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
    #define NOMINMAX
+#endif
    #include <Windows.h>
 #endif /* _MSC_VER */

--- a/tests/libslic3r/test_png_io.cpp
+++ b/tests/libslic3r/test_png_io.cpp
@ -1,4 +1,7 @@
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
+
 #include <catch2/catch.hpp>

 #include <numeric>