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

2015-10-07 18:40:02 +00:00
parent 12de7e2a4a 18bd24ba9d
commit 8b55eafed1
2 changed files with 2 additions and 0 deletions
--- 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>