From 74b32a23f7c27f03285d28d381f841e08cbbb486 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 20 Jun 2015 15:17:32 +1000 Subject: Cleanup: checks for unsupported MSVC versions --- source/blender/blenlib/BLI_compiler_compat.h | 2 +- source/blender/blenlib/BLI_math_base.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender') 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 #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)) -- cgit v1.2.3