Merge "vpx_integer: Use inttypes.h in MSVC (2013 and later)."

4d6cd41b · Tom Finegan · Gerrit Code Review · 992500b8 · 7320fdda · 4d6cd41b
Commit 4d6cd41b authored Feb 10, 2014 by Tom Finegan Committed by Gerrit Code Review Feb 10, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

vpx/vpx_integer.h vpx/vpx_integer.h +1 -1

No files found.
--- a/vpx/vpx_integer.h
+++ b/vpx/vpx_integer.h
@@ -48,7 +48,7 @@ typedef size_t uintptr_t;
 #endif

 /* VS2010 defines stdint.h, but not inttypes.h */
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && _MSC_VER < 1800
 #define PRId64 "I64d"
 #else
 #include <inttypes.h>