| Index: third_party/tcmalloc/chromium/src/windows/port.cc
|
| diff --git a/third_party/tcmalloc/chromium/src/windows/port.cc b/third_party/tcmalloc/chromium/src/windows/port.cc
|
| index ec01fd60c9583a74249fe5faf459aca03995758e..0205912bd6761a2f09a50c8fba0a762adb06d3ad 100644
|
| --- a/third_party/tcmalloc/chromium/src/windows/port.cc
|
| +++ b/third_party/tcmalloc/chromium/src/windows/port.cc
|
| @@ -149,8 +149,8 @@ static void NTAPI on_tls_callback(HINSTANCE h, DWORD dwReason, PVOID pv) {
|
|
|
| #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,10 +219,6 @@ extern "C" int perftools_pthread_once(pthread_once_t *once_control,
|
| // -----------------------------------------------------------------------
|
| // 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,
|
| @@ -338,6 +334,9 @@ void DumpSystemAllocatorStats(TCMalloc_Printer* printer) {
|
| // 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
|
|
|