diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-18 03:05:48 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-04-18 03:05:48 +0000 |
commit | 94e7c10dc9e9a420fef7be09cf3ada419334a330 (patch) | |
tree | 1ce9d5e55072afdb2796b611c311f6091c73db44 /libc/malloc_debug/malloc_debug.cpp | |
parent | 2a6a80a378518513ef44ebc00e4c2e6cd1aba673 (diff) | |
parent | 21f5850627bb9d5485073e6c07ba7b05067f7b16 (diff) |
Snap for 5480912 from 21f5850627bb9d5485073e6c07ba7b05067f7b16 to qt-release
Change-Id: Iab5f045e1493ba6bfbb79886f4549f658b39e6a1
Diffstat (limited to 'libc/malloc_debug/malloc_debug.cpp')
-rw-r--r-- | libc/malloc_debug/malloc_debug.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libc/malloc_debug/malloc_debug.cpp b/libc/malloc_debug/malloc_debug.cpp index 114579626..91e1d2610 100644 --- a/libc/malloc_debug/malloc_debug.cpp +++ b/libc/malloc_debug/malloc_debug.cpp @@ -58,7 +58,7 @@ // ------------------------------------------------------------------------ DebugData* g_debug; -int* g_malloc_zygote_child; +bool* g_zygote_child; const MallocDispatch* g_dispatch; // ------------------------------------------------------------------------ @@ -70,7 +70,7 @@ const MallocDispatch* g_dispatch; // ------------------------------------------------------------------------ __BEGIN_DECLS -bool debug_initialize(const MallocDispatch* malloc_dispatch, int* malloc_zygote_child, +bool debug_initialize(const MallocDispatch* malloc_dispatch, bool* malloc_zygote_child, const char* options); void debug_finalize(); void debug_dump_heap(const char* file_name); @@ -225,15 +225,15 @@ static void* InitHeader(Header* header, void* orig_pointer, size_t size) { return g_debug->GetPointer(header); } -bool debug_initialize(const MallocDispatch* malloc_dispatch, int* malloc_zygote_child, +bool debug_initialize(const MallocDispatch* malloc_dispatch, bool* zygote_child, const char* options) { - if (malloc_zygote_child == nullptr || options == nullptr) { + if (zygote_child == nullptr || options == nullptr) { return false; } InitAtfork(); - g_malloc_zygote_child = malloc_zygote_child; + g_zygote_child = zygote_child; g_dispatch = malloc_dispatch; |