Merge "Remove sixtap/bilinear 4x4 neon implementations"

[libvpx] / vpx / vpx_integer.h

diff --git a/vpx/vpx_integer.h b/vpx/vpx_integer.h
index 500f9b901ebb6f71d88f594f5a8469b44499b99e..e85146c5c097e8894faa48e2c5ad881574909f20 100644 (file)
--- a/vpx/vpx_integer.h
+++ b/vpx/vpx_integer.h
@@ -37,6 +37,8 @@ typedef unsigned int   uint32_t;
 typedef signed __int64   int64_t;
 typedef unsigned __int64 uint64_t;
 #define INT64_MAX _I64_MAX
+#define INT32_MAX _I32_MAX
+#define INT32_MIN _I32_MIN
 #define INT16_MAX _I16_MAX
 #define INT16_MIN _I16_MIN
 #endif
@@ -66,7 +68,12 @@ typedef size_t uintptr_t;
 #if defined(_MSC_VER) && _MSC_VER < 1800
 #define PRId64 "I64d"
 #else
+#if defined(__APPLE__)
+// When building dynamic frameworks with Swift compatibility, module maps
+// do not allow us to include the system's inttypes.h.
+#else
 #include <inttypes.h>
 #endif
+#endif
 
 #endif  // VPX_VPX_INTEGER_H_