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

Merge "test/*.h: (windows) fix min/max conflict"

parents aeae7fc9 5d912010
......@@ -30,7 +30,8 @@
#if defined(_WIN64)
#define _WIN32_LEAN_AND_MEAN
#define NOMINMAX
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <winnt.h>
......
......@@ -11,6 +11,8 @@
#define TEST_VIDEO_SOURCE_H_
#if defined(_WIN32)
#define NOMINMAX
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
#include <cstdio>
......
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