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 | |
| parent | f489e0c14cbf852472a2c89328c37adfe4b9f21c (diff) | |
Code Cleanup: WIN32 defines, check for _MSC_VER instead of !FREE_WINDOWS
| -rw-r--r-- | intern/cycles/util/util_math.h | 10 | ||||
| -rw-r--r-- | intern/iksolver/intern/TNT/tntmath.h | 2 | ||||
| -rw-r--r-- | intern/smoke/intern/tnt/tnt_math_utils.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_math_base.h | 16 |
4 files changed, 15 insertions, 15 deletions
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index fdee1e90486..f35129c4178 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -78,11 +78,11 @@ CCL_NAMESPACE_BEGIN #ifndef __KERNEL_GPU__ -#if (!defined(FREE_WINDOWS)) && (_MSC_VER < 1800) -#define copysignf(x, y) ((float)_copysign(x, y)) -#define hypotf(x, y) _hypotf(x, y) -#define isnan(x) _isnan(x) -#define isfinite(x) _finite(x) +#if defined(_MSC_VER) && (_MSC_VER < 1800) +# define copysignf(x, y) ((float)_copysign(x, y)) +# define hypotf(x, y) _hypotf(x, y) +# define isnan(x) _isnan(x) +# define isfinite(x) _finite(x) #endif #endif diff --git a/intern/iksolver/intern/TNT/tntmath.h b/intern/iksolver/intern/TNT/tntmath.h index d55acb00d04..be72796da59 100644 --- a/intern/iksolver/intern/TNT/tntmath.h +++ b/intern/iksolver/intern/TNT/tntmath.h @@ -34,7 +34,7 @@ // conventional functions required by several matrix algorithms -#if (defined _WIN32) && (_MSC_VER < 1800) +#if defined(_MSC_VER) && (_MSC_VER < 1800) #define hypot _hypot #endif diff --git a/intern/smoke/intern/tnt/tnt_math_utils.h b/intern/smoke/intern/tnt/tnt_math_utils.h index d96a0aefcd7..9226bc4e753 100644 --- a/intern/smoke/intern/tnt/tnt_math_utils.h +++ b/intern/smoke/intern/tnt/tnt_math_utils.h @@ -7,7 +7,7 @@ /* needed for fabs, sqrt() below */ #include <cmath> -#if (defined _WIN32) && (_MSC_VER < 1800) +#if defined(_MSC_VER) && (_MSC_VER < 1800) #define hypot _hypot #endif 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 |