From 46a3752a1fbff37c69ffa94df8427a3c1236e873 Mon Sep 17 00:00:00 2001
From: Martijn Berger <martijn.berger@gmail.com>
Date: Thu, 2 Jan 2014 23:32:44 +0100
Subject: [PATCH] Fix :I broke the build for MSVC 2008 this fixes it

---
 source/blender/blenlib/BLI_math_base.h | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h
index e2a5672b7ea..f218554704d 100644
--- a/source/blender/blenlib/BLI_math_base.h
+++ b/source/blender/blenlib/BLI_math_base.h
@@ -143,24 +143,17 @@ static const int NAN_INT = 0x7FC00000;
 #define copysignf(a, b) ((float)copysign(a, b))
 #endif
 
-#else /* C99 or POSIX.1-2001 */
-
-#ifdef WIN32
-#  ifndef FREE_WINDOWS
-#    ifndef isnan
-#		define isnan(n) _isnan(n)
-#	 endif
-#    ifndef hypot
-#		define hypot(a, b) _hypot(a, b)
-#	endif
-#  endif
-#endif
-
 #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
 #  endif
 #endif