From 5d91201069865826bbf253bdf3d3952860a7fedc Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Tue, 29 Sep 2015 20:28:47 -0700
Subject: [PATCH] test/*.h: (windows) fix min/max conflict

define NOMINMAX to allow the std:: versions to be used; min/max will be
defined transitively via windows.h otherwise

Change-Id: I692b03fa3e70b7a53962d3fd209498f70f712fed
---
 test/register_state_check.h | 3 ++-
 test/video_source.h         | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/register_state_check.h b/test/register_state_check.h
index 8e72f9113..399df876e 100644
--- a/test/register_state_check.h
+++ b/test/register_state_check.h
@@ -30,7 +30,8 @@
 
 #if defined(_WIN64)
 
-#define _WIN32_LEAN_AND_MEAN
+#define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <winnt.h>
 
diff --git a/test/video_source.h b/test/video_source.h
index db0157546..8739dda51 100644
--- a/test/video_source.h
+++ b/test/video_source.h
@@ -11,6 +11,8 @@
 #define TEST_VIDEO_SOURCE_H_
 
 #if defined(_WIN32)
+#define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
 #include <cstdio>
-- 
2.40.0