[Bf-blender-cvs] [46a3752] master: Fix :I broke the build for MSVC 2008 this fixes it

[Martijn Berger]

Commit: 46a3752a1fbff37c69ffa94df8427a3c1236e873
Author: Martijn Berger
Date:   Thu Jan 2 23:32:44 2014 +0100
https://developer.blender.org/rB46a3752a1fbff37c69ffa94df8427a3c1236e873

Fix :I broke the build for MSVC 2008 this fixes it

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

M	source/blender/blenlib/BLI_math_base.h

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

diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h
index e2a5672..f218554 100644
--- a/source/blender/blenlib/BLI_math_base.h
+++ b/source/blender/blenlib/BLI_math_base.h
@@ -143,27 +143,20 @@ static const int NAN_INT = 0x7FC00000;
 #define copysignf(a, b) ((float)copysign(a, b))
 #endif
 
-#else /* C99 or POSIX.1-2001 */
+#endif  /* C99 or POSIX.1-2001 */
 
 #ifdef WIN32
 #  ifndef FREE_WINDOWS
-#    ifndef isnan
+#    if (!defined isnan) && (_MSC_VER < 1800)
 #		define isnan(n) _isnan(n)
 #	 endif
-#    ifndef hypot
+#    define finite _finite
+#    if (!defined hypot) && (_MSC_VER < 1800)
 #		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 */