summaryrefslogtreecommitdiff
path: root/test/video_source.h
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2016-11-22 15:15:53 -0800
committerJames Zern <jzern@google.com>2016-11-22 15:15:53 -0800
commit446d1ee6249a2e5f79756eee455c4916191d6263 (patch)
tree5384cd4eecdffc0e1828bb97c9c131d455d281aa /test/video_source.h
parent0966757874c4555d0e781362389711dfe6e9aec7 (diff)
downloadlibvpx-446d1ee6249a2e5f79756eee455c4916191d6263.tar
libvpx-446d1ee6249a2e5f79756eee455c4916191d6263.tar.gz
libvpx-446d1ee6249a2e5f79756eee455c4916191d6263.tar.bz2
libvpx-446d1ee6249a2e5f79756eee455c4916191d6263.zip
avoid redefining WIN32_LEAN_AND_MEAN
fixes redef errors when the macro is supplied elsewhere, e.g., the command line Change-Id: Ic15726817a43e30595d50562ef1f077060c193cf
Diffstat (limited to 'test/video_source.h')
-rw-r--r--test/video_source.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/video_source.h b/test/video_source.h
index 424bb2cfb..54f692865 100644
--- a/test/video_source.h
+++ b/test/video_source.h
@@ -13,7 +13,9 @@
#if defined(_WIN32)
#undef NOMINMAX
#define NOMINMAX
+#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
+#endif
#include <windows.h>
#endif
#include <cstdio>