summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-09-07 12:15:19 -0500
committerDave Parks <davep@lindenlab.com>2012-09-07 12:15:19 -0500
commit3db09928717e71868a8bddfffe84a29e09a74c9b (patch)
treed2e347986d76bcca6204079c4e4d10d121b705ad /indra/llcommon
parent1b89f373c2ec3871585b88670d530f7c253a0bce (diff)
MAINT-1503 Fix for linux build
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llmemory.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index 36d2d9da37..d4f8c152e9 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -61,6 +61,17 @@ inline void* ll_aligned_malloc_16(size_t size) // returned hunk MUST be freed wi
#endif
}
+inline void ll_aligned_free_16(void *p)
+{
+#if defined(LL_WINDOWS)
+ _aligned_free(p);
+#elif defined(LL_DARWIN)
+ return free(p);
+#else
+ free(p); // posix_memalign() is compatible with heap deallocator
+#endif
+}
+
inline void* ll_aligned_realloc_16(void* ptr, size_t size, size_t old_size) // returned hunk MUST be freed with ll_aligned_free_16().
{
#if defined(LL_WINDOWS)
@@ -75,17 +86,6 @@ inline void* ll_aligned_realloc_16(void* ptr, size_t size, size_t old_size) // r
return ret;
#endif
}
-
-inline void ll_aligned_free_16(void *p)
-{
-#if defined(LL_WINDOWS)
- _aligned_free(p);
-#elif defined(LL_DARWIN)
- return free(p);
-#else
- free(p); // posix_memalign() is compatible with heap deallocator
-#endif
-}
#else // USE_TCMALLOC
// ll_aligned_foo_16 are not needed with tcmalloc
#define ll_aligned_malloc_16 malloc