Prevent NOMINMAX warnings

2025-08-13 21:56:05 +08:00 · 2023-08-16 11:18:11 +02:00 · 2023-08-16 11:18:11 +02:00 · bd31722bac
commit bd31722bac
parent 40c3d8b8a0
4 changed files with 5 additions and 5 deletions
--- a/src/libslic3r/OpenVDBUtils.cpp
+++ b/src/libslic3r/OpenVDBUtils.cpp
@ -1,4 +1,3 @@
-#define NOMINMAX
 #include "OpenVDBUtils.hpp"

 #ifdef _MSC_VER
--- a/src/libslic3r/SLA/SupportTreeBuilder.cpp
+++ b/src/libslic3r/SLA/SupportTreeBuilder.cpp
@ -1,9 +1,6 @@
-#define NOMINMAX
-
 #include <libslic3r/SLA/SupportTreeBuilder.hpp>
 #include <libslic3r/SLA/SupportTreeUtils.hpp>
 #include <libslic3r/SLA/SupportTreeMesher.hpp>
-//#include <libslic3r/SLA/Contour3D.hpp>

 namespace Slic3r {
 namespace sla {
--- a/src/slic3r/GUI/GUI.cpp
+++ b/src/slic3r/GUI/GUI.cpp
@ -16,7 +16,9 @@
 #import <IOKit/pwr_mgt/IOPMLib.h>
 #elif _WIN32
 #define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
+#ifndef NOMINMAX
+    #define NOMINMAX
+#endif
 #include <Windows.h>
 #include "boost/nowide/convert.hpp"
 #endif
--- a/src/slic3r/GUI/SysInfoDialog.cpp
+++ b/src/slic3r/GUI/SysInfoDialog.cpp
@ -23,7 +23,9 @@
 #ifdef _WIN32
 	// The standard Windows includes.
 	#define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
 	#define NOMINMAX
+#endif
 	#include <Windows.h>
 	#include <psapi.h>
 #endif /* _WIN32 */