From 61a9b2d8a766f0eb9e790385939589797bac37f2 Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Fri, 26 Feb 2010 00:31:08 +0000 Subject: Merge the LINUX_TC_MALLOC #define with the existing TC_MALLOC #define. BUG=36687 TEST=about:tcmalloc, etc, works when tcmalloc is enabled on Linux. Review URL: http://codereview.chromium.org/660118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40080 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/extensions/v8/heap_profiler_extension.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webkit/extensions') diff --git a/webkit/extensions/v8/heap_profiler_extension.cc b/webkit/extensions/v8/heap_profiler_extension.cc index e52c8a6..d51d4108 100644 --- a/webkit/extensions/v8/heap_profiler_extension.cc +++ b/webkit/extensions/v8/heap_profiler_extension.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" -#if defined(LINUX_USE_TCMALLOC) +#if defined(OS_LINUX) && defined(USE_TCMALLOC) #include "third_party/tcmalloc/chromium/src/google/heap-profiler.h" #endif @@ -60,7 +60,7 @@ class HeapProfilerWrapper : public v8::Extension { return v8::Handle(); } -#if defined(LINUX_USE_TCMALLOC) +#if defined(OS_LINUX) && defined(USE_TCMALLOC) static v8::Handle HeapProfilerStart(const v8::Arguments& args) { if (args.Length() >= 1 && args[0]->IsString()) { v8::Local js_prefix = args[0]->ToString(); -- cgit v1.1