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

base/process_util_linux.cc

Index: base/process_util_linux.cc
===================================================================
--- base/process_util_linux.cc	(revision 39977)
+++ base/process_util_linux.cc	(working copy)
@@ -513,9 +513,8 @@
 }  // namespace
 
 extern "C" {
+#if !defined(USE_TCMALLOC)
 
-#if !defined(LINUX_USE_TCMALLOC)
-
 extern "C" {
 void* __libc_malloc(size_t size);
 void* __libc_realloc(void* ptr, size_t size);
@@ -539,7 +538,7 @@
 // for this in process_util_unittest.cc.
 //
 // If we are using tcmalloc, then the problem is moot since tcmalloc handles
-// this for us. Thus this code is in a !defined(LINUX_USE_TCMALLOC) block.
+// this for us. Thus this code is in a !defined(USE_TCMALLOC) block.
 //
 // We call the real libc functions in this code by using __libc_malloc etc.
 // Previously we tried using dlsym(RTLD_NEXT, ...) but that failed depending on
@@ -590,7 +589,7 @@
   return 0;
 }
 
-#endif  // !defined(LINUX_USE_TCMALLOC)
+#endif  // !defined(USE_TCMALLOC)
 }  // extern C
 
 void EnableTerminationOnOutOfMemory() {