Index: third_party/tcmalloc/chromium/src/windows/port.cc |
=================================================================== |
--- third_party/tcmalloc/chromium/src/windows/port.cc (revision 124832) |
+++ third_party/tcmalloc/chromium/src/windows/port.cc (working copy) |
@@ -149,8 +149,8 @@ |
#ifdef _MSC_VER |
-// extern "C" suppresses C++ name mangling so we know the symbol names |
-// for the linker /INCLUDE:symbol pragmas above. |
+// extern "C" suppresses C++ name mangling so we know the symbol names for the |
+// linker /INCLUDE:symbol pragmas above. |
extern "C" { |
// This tells the linker to run these functions. |
#pragma data_seg(push, old_seg) |
@@ -219,6 +219,10 @@ |
// ----------------------------------------------------------------------- |
// 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, |
@@ -334,10 +338,7 @@ |
// 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. |