From: James Zern <jzern@google.com>
Date: Thu, 20 Dec 2018 20:00:18 +0000 (-0800)
Subject: vpx_integer.h: remove VPX_EMULATE_INTTYPES
X-Git-Tag: v1.8.0~41^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aecddea4f9282194831227efe63065085f3a97b1;p=libvpx

vpx_integer.h: remove VPX_EMULATE_INTTYPES

platforms supported by the library all offer stdint.h

BUG=webm:1573

Change-Id: I2ad95dfbcfc2d1890c1b7e503340fda8a9849635
---

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_