Merge "Revert "Make bionic_platform_headers available only for Bionic t...""
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
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();