From c125f4a594815ad63b50e4b684ada4b44c545932 Mon Sep 17 00:00:00 2001 From: James Zern Date: Mon, 27 Jun 2016 20:29:01 -0700 Subject: [PATCH] remove visual studio < 2010 workarounds BUG=b/29583530 Change-Id: Iafd05637eb65f4da54a9c857e79204a77646858a --- vp9/encoder/x86/vp9_dct_ssse3.c | 5 ----- vp9/encoder/x86/vp9_frame_scale_ssse3.c | 5 ----- vpx/vpx_integer.h | 12 +----------- vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c | 4 ---- vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c | 4 ---- vpx_ports/bitops.h | 3 +-- 6 files changed, 2 insertions(+), 31 deletions(-) diff --git a/vp9/encoder/x86/vp9_dct_ssse3.c b/vp9/encoder/x86/vp9_dct_ssse3.c index b09eac0..1a1d4ea 100644 --- a/vp9/encoder/x86/vp9_dct_ssse3.c +++ b/vp9/encoder/x86/vp9_dct_ssse3.c @@ -9,11 +9,6 @@ */ #include -#if defined(_MSC_VER) && _MSC_VER <= 1500 -// Need to include math.h before calling tmmintrin.h/intrin.h -// in certain versions of MSVS. -#include -#endif #include // SSSE3 #include "./vp9_rtcd.h" diff --git a/vp9/encoder/x86/vp9_frame_scale_ssse3.c b/vp9/encoder/x86/vp9_frame_scale_ssse3.c index 38af3b1..23325d6 100644 --- a/vp9/encoder/x86/vp9_frame_scale_ssse3.c +++ b/vp9/encoder/x86/vp9_frame_scale_ssse3.c @@ -8,11 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ -#if defined(_MSC_VER) && _MSC_VER <= 1500 -// Need to include math.h before calling tmmintrin.h/intrin.h -// in certain versions of MSVS. -#include -#endif #include // SSSE3 #include "./vp9_rtcd.h" diff --git a/vpx/vpx_integer.h b/vpx/vpx_integer.h index 829c9d1..2945c87 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 diff --git a/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c b/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c index b718678..cbd22dc 100644 --- a/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c +++ b/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c @@ -8,10 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ -// Due to a header conflict between math.h and intrinsics includes with ceil() -// in certain configurations under vs9 this include needs to precede -// immintrin.h. - #include #include "./vpx_dsp_rtcd.h" diff --git a/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c b/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c index 6fd5208..2bb0f4a 100644 --- a/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c +++ b/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c @@ -8,10 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ -// Due to a header conflict between math.h and intrinsics includes with ceil() -// in certain configurations under vs9 this include needs to precede -// tmmintrin.h. - #include #include "./vpx_dsp_rtcd.h" diff --git a/vpx_ports/bitops.h b/vpx_ports/bitops.h index 84ff365..19426fa 100644 --- a/vpx_ports/bitops.h +++ b/vpx_ports/bitops.h @@ -16,8 +16,7 @@ #include "vpx_ports/msvc.h" #ifdef _MSC_VER -# include // the ceil() definition must precede intrin.h -# if _MSC_VER > 1310 && (defined(_M_X64) || defined(_M_IX86)) +# if defined(_M_X64) || defined(_M_IX86) # include # define USE_MSC_INTRINSICS # endif -- 2.7.4