diff options
| author | James Cook <james@lindenlab.com> | 2007-07-11 22:23:21 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2007-07-11 22:23:21 +0000 |
| commit | 6502ae1ad8ecd260a5e33652aece764400a83e29 (patch) | |
| tree | 475dbcb4baecbf41a56ce3d035476d791d070305 /indra | |
| parent | 35bcaa96556dc2092a95d67c0d3515db8cf9e9ff (diff) | |
Missed a conflict marker in release-candidate to release merge.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmath/llv4math.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/llmath/llv4math.h b/indra/llmath/llv4math.h index 65d3aa5b71..02b39f9270 100644 --- a/indra/llmath/llv4math.h +++ b/indra/llmath/llv4math.h @@ -65,18 +65,10 @@ typedef float V4F32 __attribute__((vector_size(16))); //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -<<<<<<< .mine -// Only VS2005 supports the _M_IX86_FP macro to indicate SSE compilation -// enabled. We assume that if you are using Visual Studio, and you include -// this file, you want SSE/vectorization code. -//#if LL_MSVC && _M_IX86_FP -#if LL_MSVC -======= // Only vectorize if the entire Windows build uses SSE. // _M_IX86_FP is set when SSE code generation is turned on, and I have // confirmed this in VS2003, VS2003 SP1, and VS2005. JC #if LL_MSVC && _M_IX86_FP ->>>>>>> .r65110 #define LL_VECTORIZE 1 |