commit 18bd24ba9d239b718f7e63bd5af70675079f1fed
author James Zern <jzern@google.com> Tue Oct 06 23:05:15 2015 -0700
committer James Zern <jzern@google.com> Tue Oct 06 23:05:15 2015 -0700
tree 350c46d4d4ecece90f12d2f5522b8a213194117f
parent fcf1609b7cb4fbb0017a919ea9a280cf3517649f

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

diff --git a/test/register_state_check.h b/test/register_state_check.h
index 399df87..489c419 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>

test/video_source.h

diff --git a/test/video_source.h b/test/video_source.h
index 8739dda..ade323e 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>