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

Revert "Backing this one out since the counterpart needs to be sent upstream."

Browse Source 
This reverts commit a04d2bc28e.

Change-Id: I1b49165ca5d4bafdba7948818256a6167a363aca
This commit is contained in:
Dan Albert
2014-06-14 01:04:31 +00:00
parent a04d2bc28e
commit e5fdaa4f9d
6 changed files with 56 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libc/bionic/malloc_debug_common.h
View File

@@ -61,6 +61,12 @@
#define Malloc(function) dl ## function
#endif
// valloc(3) and pvalloc(3) were removed from POSIX 2004. We do not include them
// for LP64, but the symbols remain in LP32 for binary compatibility.
#ifndef __LP64__
#define HAVE_DEPRECATED_MALLOC_FUNCS 1
#endif
// =============================================================================
// Structures
// =============================================================================
@@ -90,9 +96,14 @@ typedef void* (*MallocDebugMalloc)(size_t);
typedef size_t (*MallocDebugMallocUsableSize)(const void*);
typedef void* (*MallocDebugMemalign)(size_t, size_t);
typedef int (*MallocDebugPosixMemalign)(void**, size_t, size_t);
#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
typedef void* (*MallocDebugPvalloc)(size_t);
#endif
typedef void* (*MallocDebugRealloc)(void*, size_t);
#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
typedef void* (*MallocDebugValloc)(size_t);
#endif
struct MallocDebug {
MallocDebugCalloc calloc;
MallocDebugFree free;
@@ -101,9 +112,13 @@ struct MallocDebug {
MallocDebugMallocUsableSize malloc_usable_size;
MallocDebugMemalign memalign;
MallocDebugPosixMemalign posix_memalign;
#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
MallocDebugPvalloc pvalloc;
#endif
MallocDebugRealloc realloc;
#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
MallocDebugValloc valloc;
#endif
};
typedef bool (*MallocDebugInit)(HashTable*);