diff options
author | Oz Linden <oz@lindenlab.com> | 2012-11-19 11:09:58 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-11-19 11:09:58 -0500 |
commit | b7f8a2479249646c7fb38ead195d5197ab733c94 (patch) | |
tree | c1bf4a2b0ecac69a4705827a042ea7f0224ebc54 /indra/llmath/llsimdmath.h | |
parent | c94756d92c7353cb91bfddb5e342f825457e1a7e (diff) | |
parent | f8749ec9bd03072cc5b50f4cb1a61289b2989c72 (diff) |
merge up to 3.4.1-release
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" |