diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-04-18 10:11:37 -0700 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2019-04-18 10:11:37 -0700 |
| commit | 634b569e23320c19222f0aa4dad2f23a802f59c1 (patch) | |
| tree | f71aa172cd7d421e4d67760bf300c033c56783e5 /libc/malloc_hooks/malloc_hooks.cpp | |
| parent | 5853eef6f6e9afaa47959d01a3bf3079578e000a (diff) | |
| parent | 94e7c10dc9e9a420fef7be09cf3ada419334a330 (diff) | |
Merge QP1A.190418.001
Change-Id: I15a19ab91b80a1778b7b62346853fe9c0c458b29
Diffstat (limited to 'libc/malloc_hooks/malloc_hooks.cpp')
| -rw-r--r-- | libc/malloc_hooks/malloc_hooks.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/malloc_hooks/malloc_hooks.cpp b/libc/malloc_hooks/malloc_hooks.cpp index 07b668f08..b1c1d5060 100644 --- a/libc/malloc_hooks/malloc_hooks.cpp +++ b/libc/malloc_hooks/malloc_hooks.cpp @@ -48,7 +48,7 @@ const MallocDispatch* g_dispatch; // ------------------------------------------------------------------------ __BEGIN_DECLS -bool hooks_initialize(const MallocDispatch* malloc_dispatch, int* malloc_zygote_child, +bool hooks_initialize(const MallocDispatch* malloc_dispatch, bool* zygote_child, const char* options); void hooks_finalize(); void hooks_get_malloc_leak_info( @@ -97,7 +97,7 @@ static void* default_memalign_hook(size_t alignment, size_t bytes, const void*) __END_DECLS // ------------------------------------------------------------------------ -bool hooks_initialize(const MallocDispatch* malloc_dispatch, int*, const char*) { +bool hooks_initialize(const MallocDispatch* malloc_dispatch, bool*, const char*) { g_dispatch = malloc_dispatch; __malloc_hook = default_malloc_hook; __realloc_hook = default_realloc_hook; |