Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Unified Diff: third_party/tcmalloc/chromium/src/windows/port.cc

Issue 7430007: Merge tcmalloc r111 (perftools v. 1.8) with the chromium/ branch. Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/tcmalloc/chromium/src/windows/port.cc
===================================================================
--- third_party/tcmalloc/chromium/src/windows/port.cc (revision 94429)
+++ third_party/tcmalloc/chromium/src/windows/port.cc (working copy)
@@ -218,10 +218,6 @@
// -----------------------------------------------------------------------
// These functions replace system-alloc.cc
-// The current system allocator. Because we don't link with system-alloc.cc,
-// we need to define our own.
-SysAllocator* sys_alloc = NULL;
-
// This is mostly like MmapSysAllocator::Alloc, except it does these weird
// munmap's in the middle of the page, which is forbidden in windows.
extern void* TCMalloc_SystemAlloc(size_t size, size_t *actual_size,
@@ -312,7 +308,10 @@
// We don't dump stats on windows, right now
}
+// The current system allocator
+SysAllocator* sys_alloc = NULL;
+
// -----------------------------------------------------------------------
// These functions rework existing functions of the same name in the
// Google codebase.

Powered by Google App Engine
This is Rietveld 408576698