diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-12-07 16:06:32 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-12-07 16:06:32 -0500 |
commit | 6dd0a500ea74a329fc3d5326a8884d6daa42dcff (patch) | |
tree | 2e6cea711be9dd4db3987fec6a241c7a28e3ca9d /indra/llmath/llsimdmath.h | |
parent | 5bb456d80cfbcdfe87526510f3b8297d315afdd8 (diff) | |
parent | 70a42af076cbe6f12a265d508b4ed96af65d26ba (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-skip-llcorehttp-test
Diffstat (limited to 'indra/llmath/llsimdmath.h')
-rw-r--r-- | indra/llmath/llsimdmath.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmath/llsimdmath.h b/indra/llmath/llsimdmath.h index cebd2ace7d..54a275633f 100644 --- a/indra/llmath/llsimdmath.h +++ b/indra/llmath/llsimdmath.h @@ -31,7 +31,7 @@ #error "Please include llmath.h before this file." #endif -#if ( ( LL_DARWIN || LL_LINUX ) && !(__SSE2__) ) || ( LL_WINDOWS && ( _M_IX86_FP < 2 ) ) +#if ( ( LL_DARWIN || LL_LINUX ) && !(__SSE2__) ) || ( LL_WINDOWS && ( _M_IX86_FP < 2 && ADDRESS_SIZE == 32 ) ) #error SSE2 not enabled. LLVector4a and related class will not compile. #endif |