diff options
| author | Nicky <sl.nicky.ml@googlemail.com> | 2016-04-22 12:59:59 +0200 |
|---|---|---|
| committer | Nicky <sl.nicky.ml@googlemail.com> | 2016-04-22 12:59:59 +0200 |
| commit | 7640c2fb446846005a191abb62d3cce1a64d2a6e (patch) | |
| tree | 3cef3adbe6c574a504562638676afed8ddab39e8 /indra/llmath | |
| parent | 637dc1f5a98e1c6cc6eecfb476ab1c20dca0c6aa (diff) | |
Windows x64: Cannot use inline assembly.
(transplanted from 0b621f8a1ee707527325eb70e59ef02c63e2bd10)
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llmath.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h index 93b9f22b25..b66a3c63d6 100644 --- a/indra/llmath/llmath.h +++ b/indra/llmath/llmath.h @@ -153,7 +153,7 @@ inline F64 llabs(const F64 a) inline S32 lltrunc( F32 f ) { -#if LL_WINDOWS && !defined( __INTEL_COMPILER ) +#if LL_WINDOWS && !defined( __INTEL_COMPILER ) && !defined( _M_AMD64 ) // Avoids changing the floating point control word. // Add or subtract 0.5 - epsilon and then round const static U32 zpfp[] = { 0xBEFFFFFF, 0x3EFFFFFF }; @@ -179,7 +179,7 @@ inline S32 lltrunc( F64 f ) inline S32 llfloor( F32 f ) { -#if LL_WINDOWS && !defined( __INTEL_COMPILER ) +#if LL_WINDOWS && !defined( __INTEL_COMPILER ) && !defined( _M_AMD64 ) // Avoids changing the floating point control word. // Accurate (unlike Stereopsis version) for all values between S32_MIN and S32_MAX and slightly faster than Stereopsis version. // Add -(0.5 - epsilon) and then round |