diff options
author | Oz Linden <oz@lindenlab.com> | 2012-07-24 13:11:14 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-07-24 13:11:14 -0400 |
commit | ef37311e9e47c26b370a61bb61361ed60f8d878a (patch) | |
tree | ea4cb7c83d7ea5e0b328ea3595fd87942bd17c89 /indra/llmath/llsimdmath.h | |
parent | 42cc602732824df9af239de3b5d7ba05b5797106 (diff) | |
parent | 8df36196215131cbac961f47bfbd4a1b925548cb (diff) |
merge up to latest viewer-pathfinding (including 3.3.4)
Diffstat (limited to 'indra/llmath/llsimdmath.h')
-rw-r--r-- | indra/llmath/llsimdmath.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llmath/llsimdmath.h b/indra/llmath/llsimdmath.h index c7cdf7b32c..01458521ec 100644 --- a/indra/llmath/llsimdmath.h +++ b/indra/llmath/llsimdmath.h @@ -67,11 +67,10 @@ template <typename T> T* LL_NEXT_ALIGNED_ADDRESS_64(T* address) #define LL_ALIGN_16(var) LL_ALIGN_PREFIX(16) var LL_ALIGN_POSTFIX(16) - - #include <xmmintrin.h> #include <emmintrin.h> +#include "llmemory.h" #include "llsimdtypes.h" #include "llsimdtypes.inl" |