diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 00:31:08 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 00:31:08 +0000 |
| commit | 61a9b2d8a766f0eb9e790385939589797bac37f2 (patch) | |
| tree | 5d96266683dc64fc6b37e6839f4ed909a9922db7 /webkit/extensions | |
| parent | 00d721c144d35882dfaf24b3869e95a8d6404ee5 (diff) | |
| download | chromium_src-61a9b2d8a766f0eb9e790385939589797bac37f2.zip chromium_src-61a9b2d8a766f0eb9e790385939589797bac37f2.tar.gz chromium_src-61a9b2d8a766f0eb9e790385939589797bac37f2.tar.bz2 | |
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
Diffstat (limited to 'webkit/extensions')
| -rw-r--r-- | webkit/extensions/v8/heap_profiler_extension.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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<v8::FunctionTemplate>(); } -#if defined(LINUX_USE_TCMALLOC) +#if defined(OS_LINUX) && defined(USE_TCMALLOC) static v8::Handle<v8::Value> HeapProfilerStart(const v8::Arguments& args) { if (args.Length() >= 1 && args[0]->IsString()) { v8::Local<v8::String> js_prefix = args[0]->ToString(); |