build(win): Fix windows.h pre-definitions

* Avoid possible double define of NOMINMAX in platform.h * More "NO" definitions in the several files where we do include windows.h to make the include less expensive. Fixes 3964 Signed-off-by: Larry Gritz <lg@larrygritz.com>
AcademySoftwareFoundation · Aug 27, 2023 · db972dc · db972dc
1 parent b445bc6
commit db972dc
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 21 deletions.
diff --git a/src/include/OpenImageIO/platform.h b/src/include/OpenImageIO/platform.h
@@ -42,9 +42,11 @@
 #    include <intrin.h>
 #endif
 
-//Avoid min and max being defined
-#if defined(_WIN32)
-#define NOMINMAX
+// Avoid min and max being defined for any subsequent include of windows.h
+#ifdef _WIN32
+#    ifndef NOMINMAX
+#        define NOMINMAX
+#    endif
 #endif
 
 #include <OpenImageIO/oiioversion.h>

diff --git a/src/libutil/filesystem.cpp b/src/libutil/filesystem.cpp
@@ -21,9 +21,18 @@
 #include <OpenImageIO/ustring.h>
 
 #ifdef _WIN32
-#    define WIN32_LEAN_AND_MEAN
-#    define VC_EXTRALEAN
-#    define NOMINMAX
+#    ifndef WIN32_LEAN_AND_MEAN
+#        define WIN32_LEAN_AND_MEAN
+#    endif
+#    ifndef VC_EXTRALEAN
+#        define VC_EXTRALEAN
+#    endif
+#    ifndef NOMINMAX
+#        define NOMINMAX
+#    endif
+#    ifndef NOGDI
+#        define NOGDI
+#    endif
 #    include <windows.h>
 
 #    include <direct.h>

diff --git a/src/libutil/plugin.cpp b/src/libutil/plugin.cpp
@@ -8,9 +8,18 @@
 #include <OpenImageIO/platform.h>
 
 #ifdef _WIN32
-#    define WIN32_LEAN_AND_MEAN
-#    define VC_EXTRALEAN
-#    define NOMINMAX
+#    ifndef WIN32_LEAN_AND_MEAN
+#        define WIN32_LEAN_AND_MEAN
+#    endif
+#    ifndef VC_EXTRALEAN
+#        define VC_EXTRALEAN
+#    endif
+#    ifndef NOMINMAX
+#        define NOMINMAX
+#    endif
+#    ifndef NOGDI
+#        define NOGDI
+#    endif
 #    include <windows.h>
 #else
 #    include <dlfcn.h>

diff --git a/src/libutil/strutil.cpp b/src/libutil/strutil.cpp
@@ -32,9 +32,18 @@
 #include <OpenImageIO/ustring.h>
 
 #ifdef _WIN32
-#    define WIN32_LEAN_AND_MEAN
-#    define VC_EXTRALEAN
-#    define NOMINMAX
+#    ifndef WIN32_LEAN_AND_MEAN
+#        define WIN32_LEAN_AND_MEAN
+#    endif
+#    ifndef VC_EXTRALEAN
+#        define VC_EXTRALEAN
+#    endif
+#    ifndef NOMINMAX
+#        define NOMINMAX
+#    endif
+#    ifndef NOGDI
+#        define NOGDI
+#    endif
 #    include <windows.h>
 
 #    include <shellapi.h>

diff --git a/src/libutil/sysutil.cpp b/src/libutil/sysutil.cpp
@@ -45,9 +45,18 @@
 #include <OpenImageIO/platform.h>
 
 #ifdef _WIN32
-#    define WIN32_LEAN_AND_MEAN
-#    define VC_EXTRALEAN
-#    define NOMINMAX
+#    ifndef WIN32_LEAN_AND_MEAN
+#        define WIN32_LEAN_AND_MEAN
+#    endif
+#    ifndef VC_EXTRALEAN
+#        define VC_EXTRALEAN
+#    endif
+#    ifndef NOMINMAX
+#        define NOMINMAX
+#    endif
+#    ifndef NOGDI
+#        define NOGDI
+#    endif
 #    include <windows.h>
 
 #    define DEFINE_CONSOLEV2_PROPERTIES

diff --git a/src/libutil/thread.cpp b/src/libutil/thread.cpp
@@ -36,9 +36,18 @@
 #include <boost/container/flat_map.hpp>
 
 #ifdef _WIN32
-#    define WIN32_LEAN_AND_MEAN
-#    define VC_EXTRALEAN
-#    define NOMINMAX
+#    ifndef WIN32_LEAN_AND_MEAN
+#        define WIN32_LEAN_AND_MEAN
+#    endif
+#    ifndef VC_EXTRALEAN
+#        define VC_EXTRALEAN
+#    endif
+#    ifndef NOMINMAX
+#        define NOMINMAX
+#    endif
+#    ifndef NOGDI
+#        define NOGDI
+#    endif
 #    include <windows.h>
 #endif
 

diff --git a/src/libutil/timer.cpp b/src/libutil/timer.cpp
@@ -8,9 +8,18 @@
 #include <OpenImageIO/timer.h>
 
 #ifdef _WIN32
-#    define WIN32_LEAN_AND_MEAN
-#    define VC_EXTRALEAN
-#    define NOMINMAX
+#    ifndef WIN32_LEAN_AND_MEAN
+#        define WIN32_LEAN_AND_MEAN
+#    endif
+#    ifndef VC_EXTRALEAN
+#        define VC_EXTRALEAN
+#    endif
+#    ifndef NOMINMAX
+#        define NOMINMAX
+#    endif
+#    ifndef NOGDI
+#        define NOGDI
+#    endif
 #    include <windows.h>
 #endif