diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-12-05 17:01:38 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-12-05 17:01:38 -0500 |
commit | 05d58c91ef55fd90ea2f3e0f1a1199ac5e690b30 (patch) | |
tree | 70ae80b97c738ceee3b4ba530454e97a8698b6cb /indra/llmath/llsimdmath.h | |
parent | 68413474c4479eee9bdbeb34ea131475ba1d646e (diff) | |
parent | 4ca084f7a06acc4ef861c1f4df2f857f8836b85e (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
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 |