From 4dabd9c0472deb49573fdafef2fa413e59703f19 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 2 Mar 2007 21:25:50 +0000
Subject: merge release@58699 beta-1-14-0@58707 -> release

---
 indra/llmath/m4math.h | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

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

diff --git a/indra/llmath/m4math.h b/indra/llmath/m4math.h
index 4f26d875ff..69463d7718 100644
--- a/indra/llmath/m4math.h
+++ b/indra/llmath/m4math.h
@@ -73,9 +73,6 @@ class LLQuaternion;
 
 static const U32 NUM_VALUES_IN_MAT4 = 4;
 
-#if LL_WINDOWS
-__declspec(align(16))
-#endif
 class LLMatrix4
 {
 public:
@@ -218,11 +215,7 @@ public:
 	friend const LLMatrix4& operator*=(LLMatrix4 &a, const F32 &b);			// Return a * b
 
 	friend std::ostream&	 operator<<(std::ostream& s, const LLMatrix4 &a);	// Stream a
-}
-#if LL_DARWIN
-__attribute__ ((aligned (16)))
-#endif
-;
+};
 
 
 inline LLMatrix4::LLMatrix4()
-- 
cgit v1.2.3