Index: third_party/libwebp/webp/types.h |
diff --git a/third_party/libwebp/webp/types.h b/third_party/libwebp/webp/types.h |
index d9ecda67921722006aaa26589944fd99f35b90aa..3e27190bef0637a56291ab2c7e2e48912ea93f78 100644 |
--- a/third_party/libwebp/webp/types.h |
+++ b/third_party/libwebp/webp/types.h |
@@ -1,4 +1,4 @@ |
-// Copyright 2010 Google Inc. |
+// Copyright 2010 Google Inc. All Rights Reserved. |
// |
// This code is licensed under the same terms as WebM: |
// Software License Agreement: http://www.webmproject.org/license/software/ |
@@ -16,6 +16,11 @@ |
#ifndef _MSC_VER |
#include <inttypes.h> |
+#ifdef __STRICT_ANSI__ |
+#define WEBP_INLINE |
+#else /* __STRICT_ANSI__ */ |
+#define WEBP_INLINE inline |
+#endif |
#else |
typedef signed char int8_t; |
typedef unsigned char uint8_t; |
@@ -25,7 +30,7 @@ typedef signed int int32_t; |
typedef unsigned int uint32_t; |
typedef unsigned long long int uint64_t; |
typedef long long int int64_t; |
-#define inline __forceinline |
+#define WEBP_INLINE __forceinline |
#endif /* _MSC_VER */ |
#ifndef WEBP_EXTERN |
@@ -34,4 +39,7 @@ typedef long long int int64_t; |
#define WEBP_EXTERN(type) extern type |
#endif /* WEBP_EXTERN */ |
+// Macro to check ABI compatibility (same major revision number) |
+#define WEBP_ABI_IS_INCOMPATIBLE(a, b) (((a) >> 8) != ((b) >> 8)) |
+ |
#endif /* WEBP_WEBP_TYPES_H_ */ |