ref: d7f1d60c51b47f6d22be919362caad09469a058b
parent: 198a046d3eaaddccc0ea74560cea6ac9d8f07f7b
parent: 446d1ee6249a2e5f79756eee455c4916191d6263
author: James Zern <jzern@google.com>
date: Tue Nov 22 19:43:21 EST 2016
Merge "avoid redefining WIN32_LEAN_AND_MEAN"
--- 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