diff options
| author | Richard Linden <none@none> | 2013-09-27 11:19:07 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-27 11:19:07 -0700 |
| commit | 35b591a47d71212e3b2c1b7eaca797d6927bde42 (patch) | |
| tree | a3b31affbed4f91af743a8584947d400a7d7f96d /indra/llcommon/llmemory.h | |
| parent | 2fad2cc7365803b63bfe2466da2558182a1c25b9 (diff) | |
| parent | e0a443f5a6b76fd1ab5ffaa8e7a1941d47c80f4f (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/llmemory.h')
| -rwxr-xr-x | indra/llcommon/llmemory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index 2330bfb8ea..8daea255f9 100755 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -145,7 +145,7 @@ inline void ll_aligned_free_32(void *p) #if defined(LL_WINDOWS) _aligned_free(p); #elif defined(LL_DARWIN) - ll_aligned_free( p ); + ll_aligned_free_fallback( p ); #else free(p); // posix_memalign() is compatible with heap deallocator #endif |