summaryrefslogtreecommitdiffstats
path: root/base/allocator
diff options
context:
space:
mode:
authorwfh <wfh@chromium.org>2015-09-20 19:21:14 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-21 02:21:54 +0000
commit1bf93991ffe7bfe8adbf4f9fc92f2a1f287fc6ed (patch)
tree6210f54347b10e5ff8b14d7b306ef708bef14cd6 /base/allocator
parent451c919c691d80e78fa0e32e1fb829bd67aea9d0 (diff)
downloadchromium_src-1bf93991ffe7bfe8adbf4f9fc92f2a1f287fc6ed.zip
chromium_src-1bf93991ffe7bfe8adbf4f9fc92f2a1f287fc6ed.tar.gz
chromium_src-1bf93991ffe7bfe8adbf4f9fc92f2a1f287fc6ed.tar.bz2
Add support for base::UncheckedMalloc on Windows.
Based on CL 944603002 by anthonyvd. BUG=447186,532981 TEST=base_unittests Review URL: https://codereview.chromium.org/1333393002 Cr-Commit-Position: refs/heads/master@{#349891}
Diffstat (limited to 'base/allocator')
-rw-r--r--base/allocator/allocator_shim_win.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/base/allocator/allocator_shim_win.cc b/base/allocator/allocator_shim_win.cc
index a1473e5..2a933ee 100644
--- a/base/allocator/allocator_shim_win.cc
+++ b/base/allocator/allocator_shim_win.cc
@@ -172,6 +172,9 @@ void* malloc(size_t size) {
return ptr;
}
+// Symbol to allow weak linkage to win_heap_malloc from memory_win.cc.
+void* (*malloc_unchecked)(size_t) = &win_heap_malloc;
+
// free.c
void free(void* p) {
win_heap_free(p);