Win: [skip ci] check if NOMINMAX is already defined before setting it

FreeCAD · Nov 11, 2020 · b7f9e35 · b7f9e35
1 parent 1b8f474
commit b7f9e35
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 0 deletions.
diff --git a/src/App/PreCompiled.h b/src/App/PreCompiled.h
@@ -39,8 +39,10 @@
 
 #ifdef FC_OS_WIN32
 #define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
 #define NOMINMAX
 #endif
+#endif
 
 #ifdef _PreComp_
 

diff --git a/src/Base/PreCompiled.h b/src/Base/PreCompiled.h
@@ -46,7 +46,9 @@
 #ifdef FC_OS_WIN32
 #include <direct.h>
 #define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #include <crtdbg.h>
 #include <shellapi.h>

diff --git a/src/Gui/PreCompiled.h b/src/Gui/PreCompiled.h
@@ -28,8 +28,10 @@
 
 #ifdef FC_OS_WIN32
 #define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
 #define NOMINMAX
 #endif
+#endif
 
 // here get the warnings of too long specifiers disabled (needed for VC6)
 #ifdef _MSC_VER

diff --git a/src/Mod/Inspection/Gui/PreCompiled.h b/src/Mod/Inspection/Gui/PreCompiled.h
@@ -40,7 +40,9 @@
 #endif
 
 #ifdef FC_OS_WIN32
+# ifndef NOMINMAX
 # define NOMINMAX
+# endif
 #endif
 
 #ifdef _MSC_VER

diff --git a/src/Mod/Measure/App/PreCompiled.h b/src/Mod/Measure/App/PreCompiled.h
@@ -39,8 +39,10 @@
 
 #ifdef FC_OS_WIN32
 #define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
 #define NOMINMAX
 #endif
+#endif
 
 #ifdef _PreComp_
 

diff --git a/src/Mod/Mesh/Gui/PreCompiled.h b/src/Mod/Mesh/Gui/PreCompiled.h
@@ -86,7 +86,9 @@
 #endif
 
 #elif defined(FC_OS_WIN32)
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <Windows.h>
 #endif  //_PreComp_
 

diff --git a/src/Mod/Part/App/PreCompiled.h b/src/Mod/Part/App/PreCompiled.h
@@ -96,7 +96,9 @@
 
 #elif defined(FC_OS_WIN32)
 #define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #endif //_PreComp_
 

diff --git a/src/Mod/Part/Gui/PreCompiled.h b/src/Mod/Part/Gui/PreCompiled.h
@@ -36,7 +36,9 @@
 #endif
 
 #ifdef FC_OS_WIN32
+# ifndef NOMINMAX
 # define NOMINMAX
+# endif
 #endif
 
 // here get the warnings of too long specifiers disabled (needed for VC6)

diff --git a/src/Mod/Points/Gui/PreCompiled.h b/src/Mod/Points/Gui/PreCompiled.h
@@ -36,7 +36,9 @@
 #endif
 
 #ifdef FC_OS_WIN32
+# ifndef NOMINMAX
 # define NOMINMAX
+# endif
 #endif
 
 #ifdef _PreComp_

diff --git a/src/Mod/Sketcher/App/PreCompiled.h b/src/Mod/Sketcher/App/PreCompiled.h
@@ -86,7 +86,9 @@
 #include <Python.h>
 
 #elif defined(FC_OS_WIN32)
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #endif // _PreComp_
 #endif