aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmath/llmath.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llmath/llmath.h')
-rw-r--r--linden/indra/llmath/llmath.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/linden/indra/llmath/llmath.h b/linden/indra/llmath/llmath.h
index 9f8e539..0de568c 100644
--- a/linden/indra/llmath/llmath.h
+++ b/linden/indra/llmath/llmath.h
@@ -35,6 +35,7 @@
35 35
36#include <cmath> 36#include <cmath>
37#include <cstdlib> 37#include <cstdlib>
38#include <complex>
38#include "lldefs.h" 39#include "lldefs.h"
39#include "llstl.h" // *TODO: Remove when LLString is gone 40#include "llstl.h" // *TODO: Remove when LLString is gone
40#include "llstring.h" // *TODO: Remove when LLString is gone 41#include "llstring.h" // *TODO: Remove when LLString is gone
@@ -60,7 +61,9 @@
60#endif 61#endif
61 62
62// Single Precision Floating Point Routines 63// Single Precision Floating Point Routines
63#if _MSC_VER < 1400 64#ifndef fsqrtf
65#define fsqrtf(x) ((F32)sqrt((F64)(x)))
66#endif
64#ifndef sqrtf 67#ifndef sqrtf
65#define sqrtf(x) ((F32)sqrt((F64)(x))) 68#define sqrtf(x) ((F32)sqrt((F64)(x)))
66#endif 69#endif
@@ -81,11 +84,6 @@
81#ifndef powf 84#ifndef powf
82#define powf(x,y) ((F32)pow((F64)(x),(F64)(y))) 85#define powf(x,y) ((F32)pow((F64)(x),(F64)(y)))
83#endif 86#endif
84#endif
85
86#ifndef fsqrtf
87#define fsqrtf(x) sqrtf(x)
88#endif
89 87
90const F32 GRAVITY = -9.8f; 88const F32 GRAVITY = -9.8f;
91 89