michael@0: diff --git a/media/libvpx/vpx/vpx_integer.h b/media/libvpx/vpx/vpx_integer.h
michael@0: --- a/media/libvpx/vpx/vpx_integer.h
michael@0: +++ b/media/libvpx/vpx/vpx_integer.h
michael@0: @@ -10,16 +10,18 @@
michael@0:  
michael@0:  
michael@0:  #ifndef VPX_INTEGER_H
michael@0:  #define VPX_INTEGER_H
michael@0:  
michael@0:  /* get ptrdiff_t, size_t, wchar_t, NULL */
michael@0:  #include <stddef.h>
michael@0:  
michael@0: +#if !defined(VPX_DONT_DEFINE_STDINT_TYPES)
michael@0: +
michael@0:  #if (defined(_MSC_VER) && (_MSC_VER < 1600)) || defined(VPX_EMULATE_INTTYPES)
michael@0:  typedef signed char  int8_t;
michael@0:  typedef signed short int16_t;
michael@0:  typedef signed int   int32_t;
michael@0:  
michael@0:  typedef unsigned char  uint8_t;
michael@0:  typedef unsigned short uint16_t;
michael@0:  typedef unsigned int   uint32_t;
michael@0: @@ -47,16 +49,18 @@ typedef unsigned int   uintptr_t;
michael@0:  
michael@0:  #if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS)
michael@0:  #define __STDC_FORMAT_MACROS
michael@0:  #endif
michael@0:  #include <stdint.h>
michael@0:  
michael@0:  #endif
michael@0:  
michael@0: +#endif
michael@0: +
michael@0:  /* VS2010 defines stdint.h, but not inttypes.h */
michael@0:  #if defined(_MSC_VER)
michael@0:  #define PRId64 "I64d"
michael@0:  #else
michael@0:  #include <inttypes.h>
michael@0:  #endif
michael@0:  
michael@0:  #endif