media/libvpx/stdint.patch@b8a032363ba2 (annotated)
media/libvpx/stdint.patch
Thu, 22 Jan 2015 13:21:57 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 22 Jan 2015 13:21:57 +0100
- branch
- TOR_BUG_9701
- changeset 15
- b8a032363ba2
- permissions
- -rw-r--r--
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
| michael@0 | 1 | diff --git a/media/libvpx/vpx/vpx_integer.h b/media/libvpx/vpx/vpx_integer.h |
| michael@0 | 2 | --- a/media/libvpx/vpx/vpx_integer.h |
| michael@0 | 3 | +++ b/media/libvpx/vpx/vpx_integer.h |
| michael@0 | 4 | @@ -10,16 +10,18 @@ |
| michael@0 | 5 | |
| michael@0 | 6 | |
| michael@0 | 7 | #ifndef VPX_INTEGER_H |
| michael@0 | 8 | #define VPX_INTEGER_H |
| michael@0 | 9 | |
| michael@0 | 10 | /* get ptrdiff_t, size_t, wchar_t, NULL */ |
| michael@0 | 11 | #include <stddef.h> |
| michael@0 | 12 | |
| michael@0 | 13 | +#if !defined(VPX_DONT_DEFINE_STDINT_TYPES) |
| michael@0 | 14 | + |
| michael@0 | 15 | #if (defined(_MSC_VER) && (_MSC_VER < 1600)) || defined(VPX_EMULATE_INTTYPES) |
| michael@0 | 16 | typedef signed char int8_t; |
| michael@0 | 17 | typedef signed short int16_t; |
| michael@0 | 18 | typedef signed int int32_t; |
| michael@0 | 19 | |
| michael@0 | 20 | typedef unsigned char uint8_t; |
| michael@0 | 21 | typedef unsigned short uint16_t; |
| michael@0 | 22 | typedef unsigned int uint32_t; |
| michael@0 | 23 | @@ -47,16 +49,18 @@ typedef unsigned int uintptr_t; |
| michael@0 | 24 | |
| michael@0 | 25 | #if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) |
| michael@0 | 26 | #define __STDC_FORMAT_MACROS |
| michael@0 | 27 | #endif |
| michael@0 | 28 | #include <stdint.h> |
| michael@0 | 29 | |
| michael@0 | 30 | #endif |
| michael@0 | 31 | |
| michael@0 | 32 | +#endif |
| michael@0 | 33 | + |
| michael@0 | 34 | /* VS2010 defines stdint.h, but not inttypes.h */ |
| michael@0 | 35 | #if defined(_MSC_VER) |
| michael@0 | 36 | #define PRId64 "I64d" |
| michael@0 | 37 | #else |
| michael@0 | 38 | #include <inttypes.h> |
| michael@0 | 39 | #endif |
| michael@0 | 40 | |
| michael@0 | 41 | #endif |
