From e2049c332b9b834e843249c1ae0ba8542491940f Mon Sep 17 00:00:00 2001
From: Boroondas Gupte <hg@boroon.dasgupta.ch>
Date: Sun, 24 Oct 2010 16:01:57 +0200
Subject: CTS-323: (part 1 of 2) Don't cast pointers to U32

---
 indra/llmath/llsimdmath.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra/llmath/llsimdmath.h')

diff --git a/indra/llmath/llsimdmath.h b/indra/llmath/llsimdmath.h
index 9377bfdb53..1be1b7a55f 100644
--- a/indra/llmath/llsimdmath.h
+++ b/indra/llmath/llsimdmath.h
@@ -41,16 +41,18 @@
 #error SSE2 not enabled. LLVector4a and related class will not compile.
 #endif
 
+#include <stdint.h>
+
 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
-- 
cgit v1.2.3


From e9d21ba941a52665d7ad2ee3483c6ac7b7ec6486 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 20 Dec 2010 15:09:15 -0600
Subject: Fix for windows build.  Reviewed by Nyx.

---
 indra/llmath/llsimdmath.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llmath/llsimdmath.h')

diff --git a/indra/llmath/llsimdmath.h b/indra/llmath/llsimdmath.h
index b6ac5190a7..c7cdf7b32c 100644
--- a/indra/llmath/llsimdmath.h
+++ b/indra/llmath/llsimdmath.h
@@ -35,7 +35,9 @@
 #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) 
 { 
-- 
cgit v1.2.3