ref: 18bd24ba9d239b718f7e63bd5af70675079f1fed
parent: fcf1609b7cb4fbb0017a919ea9a280cf3517649f
author: James Zern <[email protected]>
date: Tue Oct 6 19:05:15 EDT 2015
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
--- 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>