From 25b13a129b1617a8d3036213472b1c34122a5e7e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 10 Nov 2009 13:58:38 -0700
Subject: Viewer compiles, but still trying to get everything to link on
 Windows

---
 linden/indra/llmath/llmath.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'linden/indra/llmath')

diff --git a/linden/indra/llmath/llmath.h b/linden/indra/llmath/llmath.h
index 66451b1..9f8e539 100644
--- a/linden/indra/llmath/llmath.h
+++ b/linden/indra/llmath/llmath.h
@@ -60,9 +60,7 @@
 #endif
 
 // Single Precision Floating Point Routines
-#ifndef fsqrtf
-#define fsqrtf(x)		((F32)sqrt((F64)(x)))
-#endif
+#if _MSC_VER < 1400
 #ifndef sqrtf
 #define sqrtf(x)		((F32)sqrt((F64)(x)))
 #endif
@@ -83,6 +81,11 @@
 #ifndef powf
 #define powf(x,y) ((F32)pow((F64)(x),(F64)(y)))
 #endif
+#endif
+
+#ifndef fsqrtf
+#define fsqrtf(x)		sqrtf(x)
+#endif
 
 const F32	GRAVITY			= -9.8f;
 
-- 
cgit v1.1