diff options
| -rw-r--r-- | intern/audaspace/intern/AUD_ConverterFunctions.h | 9 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_compiler_compat.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_math_base.h | 2 | ||||
| -rw-r--r-- | source/creator/creator.c | 4 |
4 files changed, 4 insertions, 13 deletions
diff --git a/intern/audaspace/intern/AUD_ConverterFunctions.h b/intern/audaspace/intern/AUD_ConverterFunctions.h index 7817ee88c07..eca2b327b8c 100644 --- a/intern/audaspace/intern/AUD_ConverterFunctions.h +++ b/intern/audaspace/intern/AUD_ConverterFunctions.h @@ -33,16 +33,7 @@ #include "AUD_Space.h" #include <cstring> -#ifdef _MSC_VER -#if (_MSC_VER <= 1500) - typedef short int16_t; - typedef int int32_t; -#else -# include <stdint.h> -#endif -#else #include <stdint.h> -#endif typedef void (*AUD_convert_f)(data_t* target, data_t* source, int length); diff --git a/source/blender/blenlib/BLI_compiler_compat.h b/source/blender/blenlib/BLI_compiler_compat.h index 876d2c459c5..92928889c52 100644 --- a/source/blender/blenlib/BLI_compiler_compat.h +++ b/source/blender/blenlib/BLI_compiler_compat.h @@ -37,7 +37,7 @@ # include <malloc.h> #endif -#if defined(__cplusplus) && ((__cplusplus >= 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1800)) +#if defined(__cplusplus) && ((__cplusplus >= 201103L) || defined(_MSC_VER)) # define HAS_CPP11_FEATURES #endif diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index 79a2d57c966..39c1b22a632 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -90,7 +90,7 @@ static const int NAN_INT = 0x7FC00000; #endif /* do not redefine functions from C99, POSIX.1-2001 or MSVC12 (partial C99) */ -#if !(defined(_ISOC99_SOURCE) || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || (defined(_MSC_VER) && _MSC_VER >= 1800)) +#if !(defined(_ISOC99_SOURCE) || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || defined(_MSC_VER)) #ifndef sqrtf #define sqrtf(a) ((float)sqrt(a)) diff --git a/source/creator/creator.c b/source/creator/creator.c index 856d0e10f1f..a67dbd5a5c9 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -41,7 +41,7 @@ #endif #ifdef WIN32 -# if defined(_MSC_VER) && _MSC_VER >= 1800 && defined(_M_X64) +# if defined(_MSC_VER) && defined(_M_X64) # include <math.h> /* needed for _set_FMA3_enable */ # endif # include <windows.h> @@ -1645,7 +1645,7 @@ int main( #ifdef WIN32 /* FMA3 support in the 2013 CRT is broken on Vista and Windows 7 RTM (fixed in SP1). Just disable it. */ -# if defined(_MSC_VER) && _MSC_VER >= 1800 && defined(_M_X64) +# if defined(_MSC_VER) && defined(_M_X64) _set_FMA3_enable(0); # endif |