shithub: libvpx

Info  •  Files  •  Log  •  Branches

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

--- a/test/register_state_check.h

+++ b/test/register_state_check.h

@@ -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>

--- a/test/video_source.h

+++ b/test/video_source.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>