From 18bd24ba9d239b718f7e63bd5af70675079f1fed Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Tue, 6 Oct 2015 23:05:15 -0700
Subject: [PATCH] test/reg...check,video_source.h: avoid NOMINMAX redef

some mingw32 configs define this. force this to be on to ensure the
build succeeds

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

diff --git a/test/register_state_check.h b/test/register_state_check.h
index 399df876e..489c41942 100644
--- a/test/register_state_check.h
+++ b/test/register_state_check.h
@@ -30,6 +30,7 @@
 
 #if defined(_WIN64)
 
+#undef NOMINMAX
 #define NOMINMAX
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/test/video_source.h b/test/video_source.h
index 8739dda51..ade323e7c 100644
--- a/test/video_source.h
+++ b/test/video_source.h
@@ -11,6 +11,7 @@
 #define TEST_VIDEO_SOURCE_H_
 
 #if defined(_WIN32)
+#undef NOMINMAX
 #define NOMINMAX
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>