From: James Zern <jzern@google.com>
Date: Wed, 30 Sep 2015 03:28:47 +0000 (-0700)
Subject: test/*.h: (windows) fix min/max conflict
X-Git-Tag: v1.5.0~99^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5d91201069865826bbf253bdf3d3952860a7fedc;p=platform%2Fupstream%2Flibvpx.git

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

define NOMINMAX to allow the std:: versions to be used; min/max will be
defined transitively via windows.h otherwise

Change-Id: I692b03fa3e70b7a53962d3fd209498f70f712fed
---

diff --git a/test/register_state_check.h b/test/register_state_check.h
index 8e72f91..399df87 100644
--- 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>
 
diff --git a/test/video_source.h b/test/video_source.h
index db01575..8739dda 100644
--- 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>