[NOT TO COMMIT!] r109: Diff of the current tcmalloc from the original google-perftools r109.

third_party/tcmalloc/chromium/src/malloc_hook.cc

Index: third_party/tcmalloc/chromium/src/malloc_hook.cc
diff --git a/third_party/tcmalloc/chromium/src/malloc_hook.cc b/third_party/tcmalloc/chromium/src/malloc_hook.cc
index 5a61362b7b05f36dbedaf5d8c96c8468c9959d6e..f6af7d816179e91afabcc6838ad5fbb99ec1791e 100644
--- a/third_party/tcmalloc/chromium/src/malloc_hook.cc
+++ b/third_party/tcmalloc/chromium/src/malloc_hook.cc
@@ -128,7 +128,7 @@ void InitialPreMMapHook(const void* start,
   MallocHook::InvokePreMmapHook(start, size, protection, flags, fd, offset);
 }
 
-void InitialPreSbrkHook(ptrdiff_t increment) {
+void InitialPreSbrkHook(std::ptrdiff_t increment) {
   perftools_pthread_once(&once, &RemoveInitialHooksAndCallInitializers);
   MallocHook::InvokePreSbrkHook(increment);
 }
@@ -589,11 +589,11 @@ void MallocHook::InvokeMremapHookSlow(const void* result,
                                            flags, new_addr));
 }
 
-void MallocHook::InvokePreSbrkHookSlow(ptrdiff_t increment) {
+void MallocHook::InvokePreSbrkHookSlow(std::ptrdiff_t increment) {
   INVOKE_HOOKS(PreSbrkHook, presbrk_hooks_, (increment));
 }
 
-void MallocHook::InvokeSbrkHookSlow(const void* result, ptrdiff_t increment) {
+void MallocHook::InvokeSbrkHookSlow(const void* result, std::ptrdiff_t increment) {
   INVOKE_HOOKS(SbrkHook, sbrk_hooks_, (result, increment));
 }
 
@@ -799,7 +799,7 @@ extern "C" {
   void* mremap(void* old_addr, size_t old_size, size_t new_size,
                int flags, ...) __THROW
     ATTRIBUTE_SECTION(malloc_hook);
-  void* sbrk(ptrdiff_t increment) __THROW
+  void* sbrk(std::ptrdiff_t increment) __THROW
     ATTRIBUTE_SECTION(malloc_hook);
 }
 
@@ -854,9 +854,9 @@ extern "C" void* mremap(void* old_addr, size_t old_size, size_t new_size,
 }
 
 // libc's version:
-extern "C" void* __sbrk(ptrdiff_t increment);
+extern "C" void* __sbrk(std::ptrdiff_t increment);
 
-extern "C" void* sbrk(ptrdiff_t increment) __THROW {
+extern "C" void* sbrk(std::ptrdiff_t increment) __THROW {
   MallocHook::InvokePreSbrkHook(increment);
   void *result = __sbrk(increment);
   MallocHook::InvokeSbrkHook(result, increment);