diff options
| author | James Zern <jzern@google.com> | 2016-06-27 20:29:01 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2016-06-28 20:58:49 -0700 |
| commit | c125f4a594815ad63b50e4b684ada4b44c545932 (patch) | |
| tree | 267329ec955a6bce936f580035fe09ddb6a67a9a /vpx | |
| parent | 078dff72ca7bff079cb3c56d98c588c6ea6d2814 (diff) | |
| download | libvpx-c125f4a594815ad63b50e4b684ada4b44c545932.tar.gz libvpx-c125f4a594815ad63b50e4b684ada4b44c545932.tar.bz2 libvpx-c125f4a594815ad63b50e4b684ada4b44c545932.zip | |
remove visual studio < 2010 workarounds
BUG=b/29583530
Change-Id: Iafd05637eb65f4da54a9c857e79204a77646858a
Diffstat (limited to 'vpx')
| -rw-r--r-- | vpx/vpx_integer.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/vpx/vpx_integer.h b/vpx/vpx_integer.h index 829c9d132..2945c87ca 100644 --- a/vpx/vpx_integer.h +++ b/vpx/vpx_integer.h @@ -24,7 +24,7 @@ #define VPX_INLINE inline #endif -#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || defined(VPX_EMULATE_INTTYPES) +#if defined(VPX_EMULATE_INTTYPES) typedef signed char int8_t; typedef signed short int16_t; typedef signed int int32_t; @@ -33,16 +33,6 @@ typedef unsigned char uint8_t; typedef unsigned short uint16_t; typedef unsigned int uint32_t; -#if (defined(_MSC_VER) && (_MSC_VER < 1600)) -typedef signed __int64 int64_t; -typedef unsigned __int64 uint64_t; -#define INT64_MAX _I64_MAX -#define INT32_MAX _I32_MAX -#define INT32_MIN _I32_MIN -#define INT16_MAX _I16_MAX -#define INT16_MIN _I16_MIN -#endif - #ifndef _UINTPTR_T_DEFINED typedef size_t uintptr_t; #endif |