diff options
| author | James Zern <jzern@google.com> | 2018-12-21 03:59:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-21 03:59:14 +0000 |
| commit | 37e7c8a7a8e709b5db8bf43d481db74b45aee1e6 (patch) | |
| tree | da6c61bb91287cf253785a4b45cbe74db27a3173 | |
| parent | f375eefde10a7b38c70556b6d4e04b4d3c2b2263 (diff) | |
| parent | aecddea4f9282194831227efe63065085f3a97b1 (diff) | |
| download | libvpx-37e7c8a7a8e709b5db8bf43d481db74b45aee1e6.tar libvpx-37e7c8a7a8e709b5db8bf43d481db74b45aee1e6.tar.gz libvpx-37e7c8a7a8e709b5db8bf43d481db74b45aee1e6.tar.bz2 libvpx-37e7c8a7a8e709b5db8bf43d481db74b45aee1e6.zip | |
Merge "vpx_integer.h: remove VPX_EMULATE_INTTYPES"
| -rw-r--r-- | vpx/vpx_integer.h | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/vpx/vpx_integer.h b/vpx/vpx_integer.h index 249c78120..4129d156f 100644 --- a/vpx/vpx_integer.h +++ b/vpx/vpx_integer.h @@ -23,22 +23,7 @@ #define VPX_INLINE inline #endif -#if defined(VPX_EMULATE_INTTYPES) -typedef signed char int8_t; -typedef signed short int16_t; -typedef signed int int32_t; - -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; - -#ifndef _UINTPTR_T_DEFINED -typedef size_t uintptr_t; -#endif - -#else - -/* Most platforms have the C99 standard integer types. */ +/* Assume platforms have the C99 standard integer types. */ #if defined(__cplusplus) #if !defined(__STDC_FORMAT_MACROS) @@ -49,10 +34,7 @@ typedef size_t uintptr_t; #endif #endif // __cplusplus -#include <stdint.h> - -#endif // defined(VPX_EMULATE_INTTYPES) - #include <inttypes.h> +#include <stdint.h> #endif // VPX_VPX_VPX_INTEGER_H_ |