remove visual studio < 2010 workarounds
BUG=b/29583530 Change-Id: Iafd05637eb65f4da54a9c857e79204a77646858a
This commit is contained in:
parent
078dff72ca
commit
c125f4a594
@ -9,11 +9,6 @@
|
||||
*/
|
||||
|
||||
#include <assert.h>
|
||||
#if defined(_MSC_VER) && _MSC_VER <= 1500
|
||||
// Need to include math.h before calling tmmintrin.h/intrin.h
|
||||
// in certain versions of MSVS.
|
||||
#include <math.h>
|
||||
#endif
|
||||
#include <tmmintrin.h> // SSSE3
|
||||
|
||||
#include "./vp9_rtcd.h"
|
||||
|
@ -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 <math.h>
|
||||
#endif
|
||||
#include <tmmintrin.h> // SSSE3
|
||||
|
||||
#include "./vp9_rtcd.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
|
||||
|
@ -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 <immintrin.h>
|
||||
|
||||
#include "./vpx_dsp_rtcd.h"
|
||||
|
@ -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 <tmmintrin.h>
|
||||
|
||||
#include "./vpx_dsp_rtcd.h"
|
||||
|
@ -16,8 +16,7 @@
|
||||
#include "vpx_ports/msvc.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
# include <math.h> // 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 <intrin.h>
|
||||
# define USE_MSC_INTRINSICS
|
||||
# endif
|
||||
|
Loading…
Reference in New Issue
Block a user