GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-03 02:20:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some duplicate macro definition warnings

Browse Source
This commit is contained in:
Vojtech Bubnik 2023-09-11 11:10:58 +02:00
parent 649c108357
commit dd88e0c5df
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/PrusaSlicer.cpp
View File

@ -2,8 +2,12 @@
// Why? // Why?
#define _WIN32_WINNT 0x0502 #define _WIN32_WINNT 0x0502
// The standard Windows includes. // The standard Windows includes.
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#endif // WIN32_LEAN_AND_MEAN
#ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif // NOMINMAX
#include <Windows.h> #include <Windows.h>
#include <wchar.h> #include <wchar.h>
#ifdef SLIC3R_GUI #ifdef SLIC3R_GUI

10
src/PrusaSlicer_app_msvc.cpp
View File

@ -1,14 +1,16 @@
// Why? // Why?
#define _WIN32_WINNT 0x0502 #define _WIN32_WINNT 0x0502
// The standard Windows includes. // The standard Windows includes.
#define WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
#define NOMINMAX #define WIN32_LEAN_AND_MEAN
#endif // WIN32_LEAN_AND_MEAN
#ifndef NOMINMAX
#define NOMINMAX
#endif // NOMINMAX
#include <Windows.h> #include <Windows.h>
#include <shellapi.h> #include <shellapi.h>
#include <wchar.h> #include <wchar.h>
#ifdef SLIC3R_GUI #ifdef SLIC3R_GUI
extern "C" extern "C"
{ {

2
src/libslic3r/Config.hpp
View File

@ -1989,7 +1989,7 @@ public:
void set_enum_values(GUIType gui_type, const std::initializer_list<std::string_view> il) { void set_enum_values(GUIType gui_type, const std::initializer_list<std::string_view> il) {
this->enum_def_new(); 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; this->gui_type = gui_type;
enum_def->set_values(il); enum_def->set_values(il);
} }