From 735fde8c742188d019e41faf26ff67aab6a24d25 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 21 Sep 2012 18:52:08 -0700
Subject: SH-3275 WIP Run viewer metrics for object update messages added
 LLThreadLocalPtr broke llmutex out into llmutex.h got primary sampling buffer
 under thread local storage

---
 indra/llcommon/llmemory.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/llcommon/llmemory.h')

diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index 6a2323e7d8..4480e381e8 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -30,6 +30,11 @@
 
 class LLMutex ;
 
+#ifdef LL_WINDOWS
+#define LL_ALIGNED(x) __declspec(align(x))
+#else
+#define LL_ALIGNED(x) __attribute__ ((aligned (16)))
+#endif
 inline void* ll_aligned_malloc( size_t size, int align )
 {
 	void* mem = malloc( size + (align - 1) + sizeof(void*) );
-- 
cgit v1.2.3


From 5d51175cd79b15cf036cd7e6bd646a1a0777eb7f Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 20 Nov 2012 15:55:04 -0800
Subject: SH-3406 WIP convert fast timers to lltrace system fixes to merge

---
 indra/llcommon/llmemory.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon/llmemory.h')

diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index 3744e68956..e725bdd9fa 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -26,7 +26,7 @@
 #ifndef LLMEMORY_H
 #define LLMEMORY_H
 
-#include "llmemtype.h"
+#include "linden_common.h"
 
 class LLMutex ;
 
-- 
cgit v1.2.3


From 6e82bb7789c1e046dcfb97c6773150df110153f8 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@lindenlab.com>
Date: Thu, 3 Jan 2013 22:34:34 +0000
Subject: fixing linux compile errors for llcommon after LLTrace work

---
 indra/llcommon/llmemory.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llcommon/llmemory.h')

diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index e725bdd9fa..7e73afe06a 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -27,6 +27,7 @@
 #define LLMEMORY_H
 
 #include "linden_common.h"
+#include "stdint.h"
 
 class LLMutex ;
 
-- 
cgit v1.2.3


From b2197101c488de66ca9ecf71c229f5b80d1390fd Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 4 Jan 2013 13:04:09 -0800
Subject: SH-3468 WIP add memory tracking base class fix for compile error on
 windows ignore stdint.h even though VS2010 provides it

---
 indra/llcommon/llmemory.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/llcommon/llmemory.h')

diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index 7e73afe06a..4ead45679f 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -27,7 +27,9 @@
 #define LLMEMORY_H
 
 #include "linden_common.h"
-#include "stdint.h"
+#if !LL_WINDOWS
+#include <stdint.h>
+#endif
 
 class LLMutex ;
 
-- 
cgit v1.2.3


From 1a888f786c274ee6eaed54272718eeef5e685dbf Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 9 Jan 2013 23:05:07 -0800
Subject: SH-3468 WIP add memory tracking base class made LLTrace::MemTrackable
 support custom alignment LLDrawable now uses MemTrackable new and delete
 operators

---
 indra/llcommon/llmemory.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'indra/llcommon/llmemory.h')

diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index 4ead45679f..95500753e4 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -39,6 +39,20 @@ class LLMutex ;
 #define LL_CHECK_MEMORY
 #endif
 
+#if LL_WINDOWS
+#define LL_ALIGN_OF __alignof
+#else
+#define LL_ALIGN_OF __align_of__
+#endif
+
+#if LL_WINDOWS
+#define LL_DEFAULT_HEAP_ALIGN 8
+#elif LL_DARWIN
+#define LL_DEFAULT_HEAP_ALIGN 16
+#elif LL_LINUX
+#define LL_DEFAULT_HEAP_ALIGN 8
+#endif
+
 inline void* ll_aligned_malloc( size_t size, int align )
 {
 	void* mem = malloc( size + (align - 1) + sizeof(void*) );
-- 
cgit v1.2.3