generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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

Change-Id: I692b03fa3e70b7a53962d3fd209498f70f712fed
This commit is contained in:
James Zern 2015-09-29 20:28:47 -07:00
parent d2a953e02b
commit 5d91201069
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/register_state_check.h
View File

@ -30,7 +30,8 @@
#if defined(_WIN64) #if defined(_WIN64)
#define _WIN32_LEAN_AND_MEAN #define NOMINMAX
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <winnt.h> #include <winnt.h>

2
test/video_source.h
View File

@ -11,6 +11,8 @@
#define TEST_VIDEO_SOURCE_H_ #define TEST_VIDEO_SOURCE_H_
#if defined(_WIN32) #if defined(_WIN32)
#define NOMINMAX
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#endif #endif
#include <cstdio> #include <cstdio>