The Tor Browser / file comparison
comparison: media/libvpx/stdint.patch
media/libvpx/stdint.patch
- branch
- TOR_BUG_9701
- changeset 10
- ac0c01689b40
equal
deleted
inserted
replaced
| -1:000000000000 | 0:2ef67700dd99 |
|---|---|
| 1 diff --git a/media/libvpx/vpx/vpx_integer.h b/media/libvpx/vpx/vpx_integer.h | |
| 2 --- a/media/libvpx/vpx/vpx_integer.h | |
| 3 +++ b/media/libvpx/vpx/vpx_integer.h | |
| 4 @@ -10,16 +10,18 @@ | |
| 5 | |
| 6 | |
| 7 #ifndef VPX_INTEGER_H | |
| 8 #define VPX_INTEGER_H | |
| 9 | |
| 10 /* get ptrdiff_t, size_t, wchar_t, NULL */ | |
| 11 #include <stddef.h> | |
| 12 | |
| 13 +#if !defined(VPX_DONT_DEFINE_STDINT_TYPES) | |
| 14 + | |
| 15 #if (defined(_MSC_VER) && (_MSC_VER < 1600)) || defined(VPX_EMULATE_INTTYPES) | |
| 16 typedef signed char int8_t; | |
| 17 typedef signed short int16_t; | |
| 18 typedef signed int int32_t; | |
| 19 | |
| 20 typedef unsigned char uint8_t; | |
| 21 typedef unsigned short uint16_t; | |
| 22 typedef unsigned int uint32_t; | |
| 23 @@ -47,16 +49,18 @@ typedef unsigned int uintptr_t; | |
| 24 | |
| 25 #if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) | |
| 26 #define __STDC_FORMAT_MACROS | |
| 27 #endif | |
| 28 #include <stdint.h> | |
| 29 | |
| 30 #endif | |
| 31 | |
| 32 +#endif | |
| 33 + | |
| 34 /* VS2010 defines stdint.h, but not inttypes.h */ | |
| 35 #if defined(_MSC_VER) | |
| 36 #define PRId64 "I64d" | |
| 37 #else | |
| 38 #include <inttypes.h> | |
| 39 #endif | |
| 40 | |
| 41 #endif |
