From dd88e0c5df0adf41d2ba4be65d81b703aee16508 Mon Sep 17 00:00:00 2001
From: Vojtech Bubnik <bubnikv@gmail.com>
Date: Mon, 11 Sep 2023 11:10:58 +0200
Subject: [PATCH] Fixed some duplicate macro definition warnings

---
 src/PrusaSlicer.cpp          |  8 ++++++--
 src/PrusaSlicer_app_msvc.cpp | 10 ++++++----
 src/libslic3r/Config.hpp     |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/PrusaSlicer.cpp b/src/PrusaSlicer.cpp
index 4b2aaed18d..f3441a8d62 100644
--- a/src/PrusaSlicer.cpp
+++ b/src/PrusaSlicer.cpp
@@ -2,8 +2,12 @@
     // Why?
     #define _WIN32_WINNT 0x0502
     // The standard Windows includes.
-    #define WIN32_LEAN_AND_MEAN
-    #define NOMINMAX
+    #ifndef WIN32_LEAN_AND_MEAN
+        #define WIN32_LEAN_AND_MEAN
+    #endif // WIN32_LEAN_AND_MEAN
+    #ifndef NOMINMAX
+        #define NOMINMAX
+    #endif // NOMINMAX
     #include <Windows.h>
     #include <wchar.h>
     #ifdef SLIC3R_GUI
diff --git a/src/PrusaSlicer_app_msvc.cpp b/src/PrusaSlicer_app_msvc.cpp
index 90bd2d89f2..06f15aa5ad 100644
--- a/src/PrusaSlicer_app_msvc.cpp
+++ b/src/PrusaSlicer_app_msvc.cpp
@@ -1,14 +1,16 @@
 // Why?
 #define _WIN32_WINNT 0x0502
 // The standard Windows includes.
-#define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
+#ifndef WIN32_LEAN_AND_MEAN
+    #define WIN32_LEAN_AND_MEAN
+#endif // WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
+    #define NOMINMAX
+#endif // NOMINMAX
 #include <Windows.h>
 #include <shellapi.h>
 #include <wchar.h>
 
-
-
 #ifdef SLIC3R_GUI
 extern "C"
 {
diff --git a/src/libslic3r/Config.hpp b/src/libslic3r/Config.hpp
index bc8f87ac5e..d3d9fe93e3 100644
--- a/src/libslic3r/Config.hpp
+++ b/src/libslic3r/Config.hpp
@@ -1989,7 +1989,7 @@ public:
 
     void set_enum_values(GUIType gui_type, const std::initializer_list<std::string_view> il) {
         this->enum_def_new();
-        assert(gui_type == GUIType::i_enum_open || gui_type == GUIType::f_enum_open || gui_type == GUIType::select_open);
+        assert(is_gui_type_enum_open(gui_type));
         this->gui_type = gui_type;
         enum_def->set_values(il);
     }