diff options
| author | James Zern <jzern@google.com> | 2015-09-29 20:28:47 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-09-29 23:03:26 -0700 |
| commit | 5d91201069865826bbf253bdf3d3952860a7fedc (patch) | |
| tree | d227c520ffffec609b43c60cf4b5c502e3ace1eb /test/register_state_check.h | |
| parent | d2a953e02b3bf3e058187be3d73152dc6545b89a (diff) | |
| download | libvpx-5d91201069865826bbf253bdf3d3952860a7fedc.tar libvpx-5d91201069865826bbf253bdf3d3952860a7fedc.tar.gz libvpx-5d91201069865826bbf253bdf3d3952860a7fedc.tar.bz2 libvpx-5d91201069865826bbf253bdf3d3952860a7fedc.zip | |
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
Diffstat (limited to 'test/register_state_check.h')
| -rw-r--r-- | test/register_state_check.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/register_state_check.h b/test/register_state_check.h index 8e72f9113..399df876e 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> |