commit 4ead98fa844304cc5c5427fa3c6a716d2a372d88
author John Koleszar <jkoleszar@google.com> Thu May 05 10:53:24 2011 -0400
committer John Koleszar <jkoleszar@google.com> Fri May 06 08:02:39 2011 -0400
tree 3dd17a4bca213bc3ba2b18fb4b43817f2ee13edd
parent 4226f0ce64953aa7636552ccfb3487fda30e4122

Use stdint.h for VS2010

VS2010 has included stdint.h, but not inttypes.h. Prefer the compiler's
version of these types. Fixes issue 327.

Change-Id: Ica71600e06b8e94e3bbb4f12988b4a9817d5e5e4

vpx/vpx_integer.h

diff --git a/vpx/vpx_integer.h b/vpx/vpx_integer.h
index 9a06c1a..608760f 100644
--- a/vpx/vpx_integer.h
+++ b/vpx/vpx_integer.h
@@ -15,7 +15,7 @@
 /* get ptrdiff_t, size_t, wchar_t, NULL */
 #include <stddef.h>
 
-#if defined(_MSC_VER) || defined(VPX_EMULATE_INTTYPES)
+#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || defined(VPX_EMULATE_INTTYPES)
 typedef signed char  int8_t;
 typedef signed short int16_t;
 typedef signed int   int32_t;
@@ -24,10 +24,9 @@
 typedef unsigned short uint16_t;
 typedef unsigned int   uint32_t;
 
-#if defined(_MSC_VER)
+#if (defined(_MSC_VER) && (_MSC_VER < 1600))
 typedef signed __int64   int64_t;
 typedef unsigned __int64 uint64_t;
-#define PRId64 "I64d"
 #endif
 
 #ifdef HAVE_ARMV6
@@ -50,8 +49,14 @@
 #define __STDC_FORMAT_MACROS
 #endif
 #include <stdint.h>
-#include <inttypes.h>
 
 #endif
 
+/* VS2010 defines stdint.h, but not inttypes.h */
+#if defined(_MSC_VER)
+#define PRId64 "I64d"
+#else
+#include <inttypes.h>
+#endif
+
 #endif