diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-09-28 12:06:46 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-09-28 12:06:46 -0700 |
| commit | e4db67671729334b5d67d43af7bea3bd98b7447e (patch) | |
| tree | dbc7724448f235597d19b4735ab27f0b5421e551 | |
| parent | 55d7310d969638ecc853c2165b287fdb45eba8c6 (diff) | |
Re-enabling tcmalloc in the build.
| -rw-r--r-- | indra/cmake/GooglePerfTools.cmake | 2 | ||||
| -rw-r--r-- | indra/llcommon/llmemory.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 73b3642ae6..09501e0406 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -3,7 +3,7 @@ include(Prebuilt) # If you want to enable or disable TCMALLOC in viewer builds, this is the place. # set ON or OFF as desired. -set (USE_TCMALLOC OFF) +set (USE_TCMALLOC ON) if (STANDALONE) include(FindGooglePerfTools) diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h index f37e8459ff..9b7fb1b1ca 100644 --- a/indra/llcommon/llmemory.h +++ b/indra/llcommon/llmemory.h @@ -90,7 +90,7 @@ inline void* ll_aligned_realloc_16(void* ptr, size_t size, size_t old_size) // r #else // USE_TCMALLOC // ll_aligned_foo_16 are not needed with tcmalloc #define ll_aligned_malloc_16 malloc -#define ll_aligned_realloc_16 realloc +#define ll_aligned_realloc_16(a,b,c) realloc(a,b) #define ll_aligned_free_16 free #endif // USE_TCMALLOC |