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

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

Browse Source 
This reverts commit 5ee320dd35.

Change-Id: I1a9c6b06c3aca595f01c629f7649be743dc48e77
This commit is contained in:
Dan Albert
2014-06-14 00:51:14 +00:00
parent 5ee320dd35
commit a04d2bc28e
6 changed files with 8 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libc/bionic/malloc_debug_common.h
View File

@@ -61,12 +61,6 @@
#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
// =============================================================================
@@ -96,14 +90,9 @@ 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;
@@ -112,13 +101,9 @@ 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*);