Commit 8b55eafe authored by James Zern's avatar James Zern Committed by Gerrit Code Review

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

parents 12de7e2a 18bd24ba
......@@ -30,6 +30,7 @@
#if defined(_WIN64)
#undef NOMINMAX
#define NOMINMAX
#define WIN32_LEAN_AND_MEAN
#include <windows.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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment