generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 4b47d9f9: am 4c001859: Merge "Fix declaration of malloc_usable_size()"

Browse Source 
* commit '4b47d9f978296e5bb2eaabb8069960eb6f207c80':
  Fix declaration of malloc_usable_size()
This commit is contained in:
Elliott Hughes 2013-06-04 19:02:21 -07:00 committed by Android Git Automerger
commit 8ed5aec934
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/bionic/malloc_debug_common.cpp
View File

@ -190,7 +190,7 @@ extern "C" struct mallinfo mallinfo() {
return dlmallinfo(); return dlmallinfo();
} }
extern "C" size_t malloc_usable_size(void* mem) { extern "C" size_t malloc_usable_size(const void* mem) {
return dlmalloc_usable_size(mem); return dlmalloc_usable_size(mem);
} }

2
libc/include/malloc.h
View File

@ -33,7 +33,7 @@ extern void* realloc(void* p, size_t byte_count) __wur;
extern void free(void* p); extern void free(void* p);
extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur; extern void* memalign(size_t alignment, size_t byte_count) __mallocfunc __wur;
extern size_t malloc_usable_size(void* p); extern size_t malloc_usable_size(const void* p);
extern void* valloc(size_t byte_count) __mallocfunc __wur; extern void* valloc(size_t byte_count) __mallocfunc __wur;
extern void* pvalloc(size_t byte_count) __mallocfunc __wur; extern void* pvalloc(size_t byte_count) __mallocfunc __wur;