2014-10-06 14:41:18 -07:00
|
|
|
--- vpx/vpx_integer.h- 2014-09-17 15:49:58.000000000 -0700
|
|
|
|
+++ vpx/vpx_integer.h 2014-09-17 15:52:59.000000000 -0700
|
|
|
|
@@ -15,6 +15,8 @@
|
2011-12-07 18:52:33 -08:00
|
|
|
/* get ptrdiff_t, size_t, wchar_t, NULL */
|
|
|
|
#include <stddef.h>
|
|
|
|
|
|
|
|
+#if !defined(VPX_DONT_DEFINE_STDINT_TYPES)
|
|
|
|
+
|
2014-10-06 14:41:18 -07:00
|
|
|
#if defined(_MSC_VER)
|
|
|
|
#define VPX_FORCE_INLINE __forceinline
|
|
|
|
#define VPX_INLINE __inline
|
|
|
|
@@ -56,6 +58,8 @@
|
2011-12-07 18:52:33 -08:00
|
|
|
|
2014-10-02 11:20:47 -07:00
|
|
|
#endif
|
|
|
|
|
2014-10-06 14:41:18 -07:00
|
|
|
+#endif // VPX_DONT_DEFINE_STDINT_TYPES
|
2011-12-07 18:52:33 -08:00
|
|
|
+
|
|
|
|
/* VS2010 defines stdint.h, but not inttypes.h */
|
2014-10-06 14:41:18 -07:00
|
|
|
#if defined(_MSC_VER) && _MSC_VER < 1800
|
2011-12-07 18:52:33 -08:00
|
|
|
#define PRId64 "I64d"
|