From 561e521817034ea7660de987d8ab7183ad583595 Mon Sep 17 00:00:00 2001 From: wmayer Date: Fri, 5 Jul 2024 15:06:57 +0200 Subject: [PATCH] MSVC: Fix warning C4005: 'NOMINMAX': macro redefinition --- src/Mod/Fem/Gui/PreCompiled.h | 2 ++ src/Mod/PartDesign/Gui/PreCompiled.h | 7 ++++--- src/Mod/Sketcher/Gui/PreCompiled.h | 2 ++ src/Mod/TechDraw/Gui/PreCompiled.h | 4 +++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Mod/Fem/Gui/PreCompiled.h b/src/Mod/Fem/Gui/PreCompiled.h index 11a23dbce8..ef1398cef0 100644 --- a/src/Mod/Fem/Gui/PreCompiled.h +++ b/src/Mod/Fem/Gui/PreCompiled.h @@ -56,7 +56,9 @@ #ifdef FC_OS_WIN32 #define WIN32_LEAN_AND_MEAN +#ifndef NOMINMAX #define NOMINMAX +#endif #include #endif diff --git a/src/Mod/PartDesign/Gui/PreCompiled.h b/src/Mod/PartDesign/Gui/PreCompiled.h index 29ac54ca4a..99ed7a3261 100644 --- a/src/Mod/PartDesign/Gui/PreCompiled.h +++ b/src/Mod/PartDesign/Gui/PreCompiled.h @@ -32,9 +32,10 @@ #ifdef _PreComp_ #ifdef FC_OS_WIN32 -# undef NOMINMAX -# define NOMINMAX -# include +#ifndef NOMINMAX +#define NOMINMAX +#endif +#include #endif // Boost diff --git a/src/Mod/Sketcher/Gui/PreCompiled.h b/src/Mod/Sketcher/Gui/PreCompiled.h index a194183e87..28ff06cedf 100644 --- a/src/Mod/Sketcher/Gui/PreCompiled.h +++ b/src/Mod/Sketcher/Gui/PreCompiled.h @@ -49,7 +49,9 @@ #include #ifdef FC_OS_WIN32 +#ifndef NOMINMAX #define NOMINMAX +#endif #include #endif diff --git a/src/Mod/TechDraw/Gui/PreCompiled.h b/src/Mod/TechDraw/Gui/PreCompiled.h index 487a0962bd..5f034dad6c 100644 --- a/src/Mod/TechDraw/Gui/PreCompiled.h +++ b/src/Mod/TechDraw/Gui/PreCompiled.h @@ -30,7 +30,9 @@ #endif #ifdef FC_OS_WIN32 -# define NOMINMAX +#ifndef NOMINMAX +#define NOMINMAX +#endif #endif #ifdef _PreComp_