diff options
| author | Basilisk-Dev <basiliskdev@protonmail.com> | 2023-10-04 21:37:33 -0400 |
|---|---|---|
| committer | Basilisk-Dev <basiliskdev@protonmail.com> | 2023-10-04 22:10:42 -0400 |
| commit | 322bbcad1bfe2bbb03248a89b2d7e2a10dbeb601 (patch) | |
| tree | 797813d675b9e207543330529280493f435b57a4 /media/libvpx/stdint.patch | |
| parent | a2f69c22f82af2cd980ad613521d7fe11fa306c4 (diff) | |
| download | uxp-322bbcad1bfe2bbb03248a89b2d7e2a10dbeb601.tar.gz | |
Issue #2332 - Update to libvpx 1.6.1
Backport of Bugzilla 1223692 and 1331498
Diffstat (limited to 'media/libvpx/stdint.patch')
| -rw-r--r-- | media/libvpx/stdint.patch | 41 |
1 files changed, 31 insertions, 10 deletions
diff --git a/media/libvpx/stdint.patch b/media/libvpx/stdint.patch index cfa6f33271..1befd53f1c 100644 --- a/media/libvpx/stdint.patch +++ b/media/libvpx/stdint.patch @@ -1,20 +1,41 @@ ---- 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 @@ - /* get ptrdiff_t, size_t, wchar_t, NULL */ - #include <stddef.h> +diff --git a/media/libvpx/libvpx/vpx/vpx_integer.h b/media/libvpx/libvpx/vpx/vpx_integer.h +--- a/media/libvpx/libvpx/vpx/vpx_integer.h ++++ b/media/libvpx/libvpx/vpx/vpx_integer.h +@@ -18,16 +18,18 @@ + #define VPX_FORCE_INLINE __forceinline + #define VPX_INLINE __inline + #else + #define VPX_FORCE_INLINE __inline__ __attribute__(always_inline) + // TODO(jbb): Allow a way to force inline off for older compilers. + #define VPX_INLINE inline + #endif +#if !defined(VPX_DONT_DEFINE_STDINT_TYPES) + - #if (defined(_MSC_VER) && (_MSC_VER < 1600)) || defined(VPX_EMULATE_INTTYPES) - typedef signed char int8_t; + #if defined(VPX_EMULATE_INTTYPES) + typedef signed char int8_t; typedef signed short int16_t; -@@ -56,6 +58,8 @@ - + typedef signed int int32_t; + + typedef unsigned char uint8_t; + typedef unsigned short uint16_t; + typedef unsigned int uint32_t; +@@ -48,16 +50,18 @@ typedef size_t uintptr_t; + #define __STDC_LIMIT_MACROS #endif - + #endif // __cplusplus + + #include <stdint.h> + + #endif + +#endif // VPX_DONT_DEFINE_STDINT_TYPES + /* VS2010 defines stdint.h, but not inttypes.h */ #if defined(_MSC_VER) && _MSC_VER < 1800 #define PRId64 "I64d" + #else + #include <inttypes.h> + #endif + + #endif // VPX_VPX_INTEGER_H_ |