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

Unified Diff: base/allocator/allocator_shim_override_libc_symbols.h

Issue 2138173002: Hookup the generic heap intercept for Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken realloc unittest. Created 4 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: base/allocator/allocator_shim_override_libc_symbols.h
diff --git a/base/allocator/allocator_shim_override_libc_symbols.h b/base/allocator/allocator_shim_override_libc_symbols.h
index 37b3b4eb1219cde7292bb89dde826267eb78e7ce..707f7226d99ce6865d3b67adb7a293a7a537cc25 100644
--- a/base/allocator/allocator_shim_override_libc_symbols.h
+++ b/base/allocator/allocator_shim_override_libc_symbols.h
@@ -16,6 +16,8 @@
extern "C" {
+#if !defined(OS_WIN)
+
SHIM_ALWAYS_EXPORT void* malloc(size_t size) __THROW
SHIM_ALIAS_SYMBOL(ShimMalloc);
@@ -43,6 +45,25 @@ SHIM_ALWAYS_EXPORT void* pvalloc(size_t size) __THROW
SHIM_ALWAYS_EXPORT int posix_memalign(void** r, size_t a, size_t s) __THROW
SHIM_ALIAS_SYMBOL(ShimPosixMemalign);
+#else
+
+__declspec(restrict) void* malloc(size_t size) {
Sigurður Ásgeirsson 2016/07/11 19:51:51 I don't know that the link-time name aliasing used
+ return ShimMalloc(size);
+}
+
+void free(void* ptr) {
+ ShimFree(ptr);
+}
+
+__declspec(restrict) void* realloc(void* ptr, size_t size) {
+ return ShimRealloc(ptr, size);
+}
+
+__declspec(restrict) void* calloc(size_t n, size_t size) {
+ return ShimCalloc(n, size);
+}
+
+#endif
// The default dispatch translation unit has to define also the following
// symbols (unless they are ultimately routed to the system symbols):
// void malloc_stats(void);

Powered by Google App Engine
This is Rietveld 408576698