ref: 5d91201069865826bbf253bdf3d3952860a7fedc
parent: d2a953e02b3bf3e058187be3d73152dc6545b89a
author: James Zern <[email protected]>
date: Tue Sep 29 16:28:47 EDT 2015
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
--- 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>