diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-06 13:01:17 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-06 13:01:17 -0500 |
| commit | bfe6e94f5388b887253ba77f633ae332affe9f92 (patch) | |
| tree | 06169f9e4e8cb30b52b779e9a67d1bd2633577b1 /indra/llcommon | |
| parent | d3b0a1375509f772ec3ddbc790b5a5d9f4fa7594 (diff) | |
SH-2789 WIP - fixing the LL_USE_TCMALLOC code, make tests build with the same tcmalloc options as the sl executable
Diffstat (limited to 'indra/llcommon')
| -rwxr-xr-x[-rw-r--r--] | indra/llcommon/llallocator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llallocator.cpp b/indra/llcommon/llallocator.cpp index 6f6abefc67..87654b5b97 100644..100755 --- a/indra/llcommon/llallocator.cpp +++ b/indra/llcommon/llallocator.cpp @@ -27,7 +27,7 @@ #include "linden_common.h" #include "llallocator.h" -#if LL_USE_TCMALLOC +#if (LL_USE_TCMALLOC && LL_USE_HEAP_PROFILER) #include "google/heap-profiler.h" #include "google/commandlineflags_public.h" |