From a288644b1eaef1017d21368bd04c3ee1f038ff4c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 3 Jan 2014 20:46:12 +1100 Subject: Code Cleanup: WIN32 defines, check for _MSC_VER instead of !FREE_WINDOWS --- source/blender/blenlib/BLI_math_base.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender/blenlib/BLI_math_base.h') diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index f218554704d..c634c9d8228 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -146,14 +146,14 @@ static const int NAN_INT = 0x7FC00000; #endif /* C99 or POSIX.1-2001 */ #ifdef WIN32 -# ifndef FREE_WINDOWS -# if (!defined isnan) && (_MSC_VER < 1800) -# define isnan(n) _isnan(n) -# endif -# define finite _finite -# if (!defined hypot) && (_MSC_VER < 1800) -# define hypot(a, b) _hypot(a, b) -# endif +# if defined(_MSC_VER) +# if (_MSC_VER < 1800) && !defined(isnan) +# define isnan(n) _isnan(n) +# endif +# define finite(n) _finite(n) +# if (_MSC_VER < 1800) && !defined(hypot) +# define hypot(a, b) _hypot(a, b) +# endif # endif #endif -- cgit v1.2.3