forked from bartvdbraak/blender
Code Cleanup: WIN32 defines, check for _MSC_VER instead of !FREE_WINDOWS
This commit is contained in:
parent
f489e0c14c
commit
a288644b1e
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user