summaryrefslogtreecommitdiff
path: root/indra/llmath/llsimdmath.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-12-20 17:14:51 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-12-20 17:14:51 -0500
commit261ac32dda439fa1fc5708c78168967bf4d484e6 (patch)
tree22f0e531422f6b39b40ed943c80e13634a15e7a4 /indra/llmath/llsimdmath.h
parent4bd6edc6b037195012583467a3e5e754f6a5af77 (diff)
parente9d21ba941a52665d7ad2ee3483c6ac7b7ec6486 (diff)
merge
Diffstat (limited to 'indra/llmath/llsimdmath.h')
-rw-r--r--indra/llmath/llsimdmath.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llmath/llsimdmath.h b/indra/llmath/llsimdmath.h
index d6debce2d7..c7cdf7b32c 100644
--- a/indra/llmath/llsimdmath.h
+++ b/indra/llmath/llsimdmath.h
@@ -35,16 +35,20 @@
#error SSE2 not enabled. LLVector4a and related class will not compile.
#endif
+#if !LL_WINDOWS
+#include <stdint.h>
+#endif
+
template <typename T> T* LL_NEXT_ALIGNED_ADDRESS(T* address)
{
return reinterpret_cast<T*>(
- (reinterpret_cast<U32>(address) + 0xF) & ~0xF);
+ (reinterpret_cast<uintptr_t>(address) + 0xF) & ~0xF);
}
template <typename T> T* LL_NEXT_ALIGNED_ADDRESS_64(T* address)
{
return reinterpret_cast<T*>(
- (reinterpret_cast<U32>(address) + 0x3F) & ~0x3F);
+ (reinterpret_cast<uintptr_t>(address) + 0x3F) & ~0x3F);
}
#if LL_LINUX || LL_DARWIN