From 4ead98fa844304cc5c5427fa3c6a716d2a372d88 Mon Sep 17 00:00:00 2001 From: John Koleszar Date: Thu, 5 May 2011 10:53:24 -0400 Subject: [PATCH] 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 | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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 -#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 char uint8_t; 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 @@ typedef unsigned int uintptr_t; #define __STDC_FORMAT_MACROS #endif #include -#include #endif +/* VS2010 defines stdint.h, but not inttypes.h */ +#if defined(_MSC_VER) +#define PRId64 "I64d" +#else +#include +#endif + #endif -- 2.7.4