ref: 8b55eafed164aedafdc96f28c3e9e0262655d29c
parent: 12de7e2a4a115cb01aa6ea3ec324fd4bd7a323af
parent: 18bd24ba9d239b718f7e63bd5af70675079f1fed
author: James Zern <[email protected]>
date: Wed Oct 7 14:40:02 EDT 2015
Merge "test/reg...check,video_source.h: avoid NOMINMAX redef"
--- 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>