Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Code Cleanup: WIN32 defines, check for _MSC_VER instead of !FREE_WINDOWS

Browse Source
This commit is contained in:
Campbell Barton
2014-01-03 20:46:12 +11:00
parent f489e0c14c
commit a288644b1e
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/cycles/util/util_math.h
View File

@@ -78,11 +78,11 @@ CCL_NAMESPACE_BEGIN
#ifndef __KERNEL_GPU__ #ifndef __KERNEL_GPU__
#if (!defined(FREE_WINDOWS)) && (_MSC_VER < 1800) #if defined(_MSC_VER) && (_MSC_VER < 1800)
#define copysignf(x, y) ((float)_copysign(x, y)) # define copysignf(x, y) ((float)_copysign(x, y))
#define hypotf(x, y) _hypotf(x, y) # define hypotf(x, y) _hypotf(x, y)
#define isnan(x) _isnan(x) # define isnan(x) _isnan(x)
#define isfinite(x) _finite(x) # define isfinite(x) _finite(x)
#endif #endif
#endif #endif

2
intern/iksolver/intern/TNT/tntmath.h
View File

@@ -34,7 +34,7 @@
// conventional functions required by several matrix algorithms // conventional functions required by several matrix algorithms
#if (defined _WIN32) && (_MSC_VER < 1800) #if defined(_MSC_VER) && (_MSC_VER < 1800)
#define hypot _hypot #define hypot _hypot
#endif #endif

2
intern/smoke/intern/tnt/tnt_math_utils.h
View File

@@ -7,7 +7,7 @@
/* needed for fabs, sqrt() below */ /* needed for fabs, sqrt() below */
#include <cmath> #include <cmath>
#if (defined _WIN32) && (_MSC_VER < 1800) #if defined(_MSC_VER) && (_MSC_VER < 1800)
#define hypot _hypot #define hypot _hypot
#endif #endif

16
source/blender/blenlib/BLI_math_base.h
View File

@@ -146,14 +146,14 @@ static const int NAN_INT = 0x7FC00000;
#endif /* C99 or POSIX.1-2001 */ #endif /* C99 or POSIX.1-2001 */
#ifdef WIN32 #ifdef WIN32
# ifndef FREE_WINDOWS # if defined(_MSC_VER)
# if (!defined isnan) && (_MSC_VER < 1800) # if (_MSC_VER < 1800) && !defined(isnan)
# define isnan(n) _isnan(n) # define isnan(n) _isnan(n)
# endif # endif
# define finite _finite # define finite(n) _finite(n)
# if (!defined hypot) && (_MSC_VER < 1800) # if (_MSC_VER < 1800) && !defined(hypot)
# define hypot(a, b) _hypot(a, b) # define hypot(a, b) _hypot(a, b)
# endif # endif
# endif # endif
#endif #endif