summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-08-29 19:19:42 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-08-29 19:19:42 -0700
commit73eec0321f79bb7ceeb2b2027e63660158413e5e (patch)
treee264a8962c34f0768bed34500d4af1af8a0eba27 /indra/llcommon
parentbe61b5be2f4089e12ca25ca1ece13bd0fdaea543 (diff)
parent01a154809d650f7905aaa208150a1070b19e5c2b (diff)
merging in latest changes
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llmemory.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index 9dd776ff57..08e2a2caa6 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -65,6 +65,8 @@ inline void* ll_aligned_realloc_16(void* ptr, size_t size) // returned hunk MUST
#elif defined(LL_DARWIN)
return realloc(ptr,size); // default osx malloc is 16 byte aligned.
#else
+ // The realloc alignment test is skipped on Linux because the ll_aligned_realloc_16()
+ // function is not implemented to ensure alignment (see alignment_test.cpp)
return realloc(ptr,size); // FIXME not guaranteed to be aligned.
#endif
}