diff options
| author | Richard Linden <none@none> | 2012-09-21 18:52:08 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-09-21 18:52:08 -0700 |
| commit | 735fde8c742188d019e41faf26ff67aab6a24d25 (patch) | |
| tree | 2a9b09c54e49a738be17511470dd565c45c41180 /indra/llcommon/llmemory.h | |
| parent | d5fce3a8093bb101b7a536f3611d3135167b05c4 (diff) | |
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
Diffstat (limited to 'indra/llcommon/llmemory.h')
| -rw-r--r-- | indra/llcommon/llmemory.h | 5 |
1 files changed, 5 insertions, 0 deletions
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*) ); |