Merge tcmalloc r111 (perftools v. 1.8) with the chromium/ branch.

third_party/tcmalloc/chromium/src/libc_override.h

 // Copyright (c) 2011, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 51 matching lines @@
 // For windows, there are two ways to get tcmalloc.  If we're
 // patching, then src/windows/patch_function.cc will do the necessary
 // overriding here.  Otherwise, we doing the 'redefine' trick, where
 // we remove malloc/new/etc from mscvcrt.dll, and just need to define
 // them now.
 #if defined(_WIN32) && defined(WIN32_DO_PATCHING)
 void PatchWindowsFunctions();   // in src/windows/patch_function.cc
 static void ReplaceSystemAlloc() { PatchWindowsFunctions(); }
 
 #elif defined(_WIN32) && !defined(WIN32_DO_PATCHING)
+// On Windows we define the allocation functions in
+// base/allocator/allocator_shim.cc, so we can't include
+// libc_override_redefine.h here.
+// We also need to define ReplaceSystemAlloc() somewhere.
+#if 0
 #include "libc_override_redefine.h"
+#else
+static void ReplaceSystemAlloc() { }
+#endif
 
 #elif defined(__APPLE__)
 #include "libc_override_osx.h"
 
 #elif defined(__GLIBC__)
 #include "libc_override_glibc.h"
 
 // Not all gcc systems necessarily support weak symbols, but all the
 // ones I know of do, so for now just assume they all do.
 #elif defined(__GNUC__)
 #include "libc_override_gcc_and_weak.h"
 
 #else
 #error Need to add support for your libc/OS here
 
 #endif
 
 #endif  // TCMALLOC_LIBC_OVERRIDE_INL_H_