summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-06-11 03:15:22 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-06-10 22:20:24 +0000
commit80664231b8a17fc6a1bf2f4881c9353a47b74ab6 (patch)
treee19f934938a7d835590250d4d7499edb6e41251e
parent30d15e5499ab097e1074b4e78e4397f5429975ac (diff)
parent67c437b2315a0b01ca4031192879f8eba966b1a7 (diff)
downloadbionic-80664231b8a17fc6a1bf2f4881c9353a47b74ab6.zip
bionic-80664231b8a17fc6a1bf2f4881c9353a47b74ab6.tar.gz
bionic-80664231b8a17fc6a1bf2f4881c9353a47b74ab6.tar.bz2
Merge "Revert "Temporarily expose dlmalloc_usable_size.""
-rw-r--r--libc/bionic/dlmalloc.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/libc/bionic/dlmalloc.h b/libc/bionic/dlmalloc.h
index 482fe0e..e065687 100644
--- a/libc/bionic/dlmalloc.h
+++ b/libc/bionic/dlmalloc.h
@@ -32,15 +32,10 @@
#define USE_SPIN_LOCKS 0
#define DEFAULT_MMAP_THRESHOLD (64U * 1024U)
-__BEGIN_DECLS
-
/* Export two symbols used by the VM. */
+__BEGIN_DECLS
int dlmalloc_trim(size_t) __LIBC_ABI_PUBLIC__;
void dlmalloc_inspect_all(void (*handler)(void*, void*, size_t, void*), void*) __LIBC_ABI_PUBLIC__;
-
-/* NVIDIA's libglcore.so has a reference to dlmalloc_usable_size. TODO: remove this. */
-size_t dlmalloc_usable_size(const void*) __LIBC_ABI_PUBLIC__;
-
__END_DECLS
/* Include the proper definitions. */