diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-01-03 13:46:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-03 13:46:12 +0400 |
| commit | a288644b1eaef1017d21368bd04c3ee1f038ff4c (patch) | |
| tree | 82dd0dd2d688b873a6d9c97607189a268c97aca4 /source/blender/blenlib/BLI_math_base.h | |
| parent | f489e0c14cbf852472a2c89328c37adfe4b9f21c (diff) | |
Code Cleanup: WIN32 defines, check for _MSC_VER instead of !FREE_WINDOWS
Diffstat (limited to 'source/blender/blenlib/BLI_math_base.h')
| -rw-r--r-- | source/blender/blenlib/BLI_math_base.h | 16 |
1 files changed, 8 insertions, 8 deletions
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 |