diff options
| author | graham linden <graham@lindenlab.com> | 2013-03-05 13:42:57 -0800 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-03-05 13:42:57 -0800 |
| commit | 046014aa10e535bfa18e3d7b4c2da70284a615ae (patch) | |
| tree | a2ddc78c2da49f22ae6c11195b0fbc5c27e32e5b /indra/llcommon | |
| parent | b19eeabd54afcfb56e864899c166b64db1ac6790 (diff) | |
| parent | a65c275865f1cc9bf53237e4b8c99a7bee3731ee (diff) | |
Merged lindenlab/viewer-cat into default
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llmemory.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index e725bdd9fa..46cabfadcd 100644 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -38,17 +38,28 @@ class LLMutex ; inline void* ll_aligned_malloc( size_t size, int align ) { +#if defined(LL_WINDOWS) + return _aligned_malloc(size, align); +#else void* mem = malloc( size + (align - 1) + sizeof(void*) ); char* aligned = ((char*)mem) + sizeof(void*); aligned += align - ((uintptr_t)aligned & (align - 1)); ((void**)aligned)[-1] = mem; return aligned; +#endif } inline void ll_aligned_free( void* ptr ) { - free( ((void**)ptr)[-1] ); +#if defined(LL_WINDOWS) + _aligned_free(ptr); +#else + if (ptr) + { + free( ((void**)ptr)[-1] ); + } +#endif } #if !LL_USE_TCMALLOC |