commit dfea6d6eb6694229bd31a2be882cf7067326cd0e
author James Zern <jzern@google.com> Thu May 04 13:16:10 2023 -0700
committer Wan-Teh Chang <wtc@google.com> Fri May 05 02:25:20 2023 +0000
tree e8b20010a1c2e5d44d9fae8d00d8a1f05714e0a5
parent 4835a3ea00c3b1ef673daacb36838be0436ecd30

fix redefinition of WIN32_LEAN_AND_MEAN

Change-Id: I11c31b8022e88c8bb36ea03275b9ac5fdfeaee08
(cherry picked from commit b6cfc3cf4551515edd75eb57b77837b58cdba8f4)

aom_ports/arm_cpudetect.c

diff --git a/aom_ports/arm_cpudetect.c b/aom_ports/arm_cpudetect.c
index 23d3aa5..305b22c 100644
--- a/aom_ports/arm_cpudetect.c
+++ b/aom_ports/arm_cpudetect.c
@@ -58,7 +58,9 @@
 
 #elif defined(_MSC_VER) /* end !CONFIG_RUNTIME_CPU_DETECT || __APPLE__ */
 /*For GetExceptionCode() and EXCEPTION_ILLEGAL_INSTRUCTION.*/
+#undef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#undef WIN32_EXTRA_LEAN
 #define WIN32_EXTRA_LEAN
 #include <windows.h>
 

aom_util/aom_thread.h

diff --git a/aom_util/aom_thread.h b/aom_util/aom_thread.h
index 6750f1a..7db7924 100644
--- a/aom_util/aom_thread.h
+++ b/aom_util/aom_thread.h
@@ -31,6 +31,7 @@
 // Prevent leaking max/min macros.
 #undef NOMINMAX
 #define NOMINMAX
+#undef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <errno.h>    // NOLINT
 #include <process.h>  // NOLINT

test/register_state_check.h

diff --git a/test/register_state_check.h b/test/register_state_check.h
index 3c244c2..0a150c3 100644
--- a/test/register_state_check.h
+++ b/test/register_state_check.h
@@ -30,6 +30,7 @@
 
 #undef NOMINMAX
 #define NOMINMAX
+#undef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <winnt.h>

test/video_source.h

diff --git a/test/video_source.h b/test/video_source.h
index 7d953f4..f7a8b98 100644
--- a/test/video_source.h
+++ b/test/video_source.h
@@ -14,6 +14,7 @@
 #if defined(_WIN32)
 #undef NOMINMAX
 #define NOMINMAX
+#undef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif