shithub: libvpx

Info  •  Files  •  Log  •  Branches

vpx_timer.h,x86.h: define NOMINMAX for windows.h

avoids the definition of min/max macros in headers that may appear in
c++ unit tests. the codebase uses VPXMIN/MAX for this purpose in any
case

Change-Id: I2b679b045d64fb34fd8780f704e3caf10a758d82

--- a/vpx_ports/vpx_timer.h

+++ b/vpx_ports/vpx_timer.h

@@ -21,6 +21,8 @@

 /*

  * Win32 specific includes

  */

+#undef NOMINMAX

+#define NOMINMAX

 #ifndef WIN32_LEAN_AND_MEAN

 #define WIN32_LEAN_AND_MEAN

 #endif

--- a/vpx_ports/x86.h

+++ b/vpx_ports/x86.h

@@ -140,6 +140,9 @@

 #endif

 #if defined(_MSC_VER) && _MSC_VER >= 1700

+#undef NOMINMAX

+#define NOMINMAX

+#define WIN32_LEAN_AND_MEAN

 #include <windows.h>

 #if WINAPI_FAMILY_PARTITION(WINAPI_FAMILY_APP)

 #define getenv(x) NULL