diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-06-20 08:17:32 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-06-20 08:17:32 +0300 |
commit | 74b32a23f7c27f03285d28d381f841e08cbbb486 (patch) | |
tree | a34bd8427760e98186d1c3fb5e647acc6550e103 /source | |
parent | 4addabaed8b1836b84a8d255b4ff3bb865882de5 (diff) |
Cleanup: checks for unsupported MSVC versions
Diffstat (limited to 'source')
-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 |
3 files changed, 4 insertions, 4 deletions
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 |