From af7dd5b32eca5c924695637bd3b922e6793b1d8a Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Thu, 23 Aug 2018 17:08:44 -0400 Subject: Rename struct mallinfo -> struct dlmallinfo Also: don't #include /usr/include/malloc.h in dlmalloc.h Change-Id: Ic73ff8862cc8aba371488b912255e28dd96374ff Signed-off-by: Dave Barach --- src/vppinfra/dlmalloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/vppinfra/dlmalloc.c') diff --git a/src/vppinfra/dlmalloc.c b/src/vppinfra/dlmalloc.c index 5316d41b6dc..16f2de0fc09 100644 --- a/src/vppinfra/dlmalloc.c +++ b/src/vppinfra/dlmalloc.c @@ -2078,8 +2078,8 @@ static void do_check_malloc_state(mstate m) { /* ----------------------------- statistics ------------------------------ */ #if !NO_MALLINFO -static struct mallinfo internal_mallinfo(mstate m) { - struct mallinfo nm = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +static struct dlmallinfo internal_mallinfo(mstate m) { + struct dlmallinfo nm = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; ensure_initialization(); if (!PREACTION(m)) { check_malloc_state(m); @@ -3963,7 +3963,7 @@ size_t dlmalloc_set_footprint_limit(size_t bytes) { } #if !NO_MALLINFO -struct mallinfo dlmallinfo(void) { +struct dlmallinfo dlmallinfo(void) { return internal_mallinfo(gm); } #endif /* NO_MALLINFO */ @@ -4781,7 +4781,7 @@ size_t mspace_set_footprint_limit(mspace msp, size_t bytes) { } #if !NO_MALLINFO -struct mallinfo mspace_mallinfo(mspace msp) { +struct dlmallinfo mspace_mallinfo(mspace msp) { mstate ms = (mstate)msp; if (!ok_magic(ms)) { USAGE_ERROR_ACTION(ms,ms); -- cgit 1.2.3-korg