[Bf-blender-cvs] [1c8a12e] master: Fix T37987: MSVC 2013 has C99 headers and warns for out define hypot _hypot for good reason it seems

[Martijn Berger]

Commit: 1c8a12ee61a00da103fe79bcc52f30a9a71bdc25
Author: Martijn Berger
Date:   Thu Jan 2 22:19:10 2014 +0100
https://developer.blender.org/rB1c8a12ee61a00da103fe79bcc52f30a9a71bdc25

Fix T37987: MSVC 2013 has C99 headers and warns for out define hypot _hypot for good reason it seems

===================================================================

M	intern/cycles/util/util_math.h
M	intern/iksolver/intern/TNT/tntmath.h
M	intern/smoke/intern/tnt/tnt_math_utils.h
M	source/blender/blenlib/BLI_math_base.h

===================================================================

diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h
index 851c67b..fdee1e9 100644
--- a/intern/cycles/util/util_math.h
+++ b/intern/cycles/util/util_math.h
@@ -78,7 +78,7 @@ CCL_NAMESPACE_BEGIN
 
 #ifndef __KERNEL_GPU__
 
-#if(!defined(FREE_WINDOWS))
+#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)
diff --git a/intern/iksolver/intern/TNT/tntmath.h b/intern/iksolver/intern/TNT/tntmath.h
index a1fef28..d55acb0 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
 
-#ifdef _WIN32
+#if (defined _WIN32) && (_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 e0bf483..d96a0ae 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>
 
-#ifdef _WIN32
+#if (defined _WIN32) && (_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 99d9397..e2a5672 100644
--- a/source/blender/blenlib/BLI_math_base.h
+++ b/source/blender/blenlib/BLI_math_base.h
@@ -143,20 +143,27 @@ static const int NAN_INT = 0x7FC00000;
 #define copysignf(a, b) ((float)copysign(a, b))
 #endif
 
-#endif  /* C99 or POSIX.1-2001 */
+#else /* C99 or POSIX.1-2001 */
 
 #ifdef WIN32
 #  ifndef FREE_WINDOWS
 #    ifndef isnan
 #		define isnan(n) _isnan(n)
 #	 endif
-#    define finite _finite
 #    ifndef hypot
 #		define hypot(a, b) _hypot(a, b)
 #	endif
 #  endif
 #endif
 
+#endif  /* C99 or POSIX.1-2001 */
+
+#ifdef WIN32
+#  ifndef FREE_WINDOWS
+#    define finite _finite
+#  endif
+#endif
+
 /* Causes warning:
  * incompatible types when assigning to type 'Foo' from type 'Bar'
  * ... the compiler optimizes away the temp var */