Merge the LINUX_TC_MALLOC #define with the existing TC_MALLOC #define....

webkit/extensions/v8/heap_profiler_extension.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/extensions/v8/heap_profiler_extension.h"
 
 #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
 
 namespace extensions_v8 {
 
 namespace {
 
 const char kHeapProfilerExtensionName[] = "v8/HeapProfiler";
 
 class HeapProfilerWrapper : public v8::Extension {
@@ skipping 33 matching lines @@
     if (name->Equals(v8::String::New("HeapProfilerStart"))) {
       return v8::FunctionTemplate::New(HeapProfilerStart);
     } else if (name->Equals(v8::String::New("HeapProfilerStop"))) {
       return v8::FunctionTemplate::New(HeapProfilerStop);
     } else if (name->Equals(v8::String::New("HeapProfilerDump"))) {
       return v8::FunctionTemplate::New(HeapProfilerDump);
     }
     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();
       char prefix[256];
       js_prefix->WriteAscii(prefix, 0, arraysize(prefix) - 1);
       ::HeapProfilerStart(prefix);
     }
     return v8::Undefined();
   }
 
@@ skipping 28 matching lines @@
 #endif
 };
 
 }  // namespace
 
 v8::Extension* HeapProfilerExtension::Get() {
   return new HeapProfilerWrapper;
 }
 
 }  // namespace extensions_v8