shithub: libvpx

Info  •  Files  •  Log  •  Branches

avoid redefining WIN32_LEAN_AND_MEAN

fixes redef errors when the macro is supplied elsewhere, e.g., the
command line

Change-Id: Ic15726817a43e30595d50562ef1f077060c193cf

--- a/test/register_state_check.h

+++ b/test/register_state_check.h

@@ -32,7 +32,9 @@

 #undef NOMINMAX

 #define NOMINMAX

+#ifndef WIN32_LEAN_AND_MEAN

 #define WIN32_LEAN_AND_MEAN

+#endif

 #include <windows.h>

 #include <winnt.h>

--- a/test/video_source.h

+++ b/test/video_source.h

@@ -13,7 +13,9 @@

 #if defined(_WIN32)

 #undef NOMINMAX

 #define NOMINMAX

+#ifndef WIN32_LEAN_AND_MEAN

 #define WIN32_LEAN_AND_MEAN

+#endif

 #include <windows.h>

 #endif

 #include <cstdio>

--- a/vpx_ports/arm_cpudetect.c

+++ b/vpx_ports/arm_cpudetect.c

@@ -58,8 +58,12 @@

 #elif defined(_MSC_VER) /* end !CONFIG_RUNTIME_CPU_DETECT */

 /*For GetExceptionCode() and EXCEPTION_ILLEGAL_INSTRUCTION.*/

+#ifndef WIN32_LEAN_AND_MEAN

 #define WIN32_LEAN_AND_MEAN

+#endif

+#ifndef WIN32_EXTRA_LEAN

 #define WIN32_EXTRA_LEAN

+#endif

 #include <windows.h>

 int arm_cpu_caps(void) {

--- a/vpx_ports/x86.h

+++ b/vpx_ports/x86.h

@@ -142,7 +142,9 @@

 #if defined(_MSC_VER) && _MSC_VER >= 1700

 #undef NOMINMAX

 #define NOMINMAX

+#ifndef WIN32_LEAN_AND_MEAN

 #define WIN32_LEAN_AND_MEAN

+#endif

 #include <windows.h>

 #if WINAPI_FAMILY_PARTITION(WINAPI_FAMILY_APP)

 #define getenv(x) NULL