Merge "test/reg...check,video_source.h: avoid NOMINMAX redef"

8b55eafe · James Zern · Gerrit Code Review · 12de7e2a · 18bd24ba · 8b55eafe
Commit 8b55eafe authored Oct 07, 2015 by James Zern Committed by Gerrit Code Review Oct 07, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

test/register_state_check.h test/register_state_check.h +1 -0

test/video_source.h test/video_source.h +1 -0

No files found.
--- 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>

--- 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>