commit 38d0a7d9dcf4b92d88f06e742b13b1a15cc25b0a
author Martin Stjernholm <mast@google.com> Wed Apr 29 10:30:23 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 29 10:30:23 2020 +0000
tree 3a06e78c617262b47e3546759892e893142b34bd
parent cbc67b305119dd1720a7eb03595482851c4ffcf6
parent 249f726583050004cfff03d0cc7cdc4212994bdd

Merge "Make bionic_platform_headers available only for Bionic targets."

libc/malloc_hooks/README.md

diff --git a/libc/malloc_hooks/README.md b/libc/malloc_hooks/README.md
index b418e1e..1747e8d 100644
--- a/libc/malloc_hooks/README.md
+++ b/libc/malloc_hooks/README.md
@@ -74,11 +74,11 @@
 ======================
 Below is a simple implementation intercepting only malloc/calloc calls.
 
-    void* new_malloc_hook(size_t bytes, const char* arg) {
+    void* new_malloc_hook(size_t bytes, const void* arg) {
       return orig_malloc_hook(bytes, arg);
     }
 
-    void orig_malloc_hook = __malloc_hook;
+    auto orig_malloc_hook = __malloc_hook;
     __malloc_hook = new_malloc_hook;
 
 Enabling Examples

libc/private/bionic_globals.h

diff --git a/libc/private/bionic_globals.h b/libc/private/bionic_globals.h
index 6e7eb76..54605db 100644
--- a/libc/private/bionic_globals.h
+++ b/libc/private/bionic_globals.h
@@ -101,8 +101,8 @@
   const char* init_progname = nullptr;
   char** init_environ = nullptr;
 
-  const gwp_asan::AllocatorState *gwp_asan_state = nullptr;
-  const gwp_asan::AllocationMetadata *gwp_asan_metadata = nullptr;
+  const gwp_asan::AllocatorState* gwp_asan_state = nullptr;
+  const gwp_asan::AllocationMetadata* gwp_asan_metadata = nullptr;
 };
 
 __LIBC_HIDDEN__ libc_shared_globals* __libc_shared_globals();