diff options
| author |   Dave Barach <dave@barachs.net> | 2018-08-23 17:08:44 -0400 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-08-24 11:04:18 +0000 |
| commit | af7dd5b32eca5c924695637bd3b922e6793b1d8a (patch) | |
| tree | 7bbfe7195fb124571e9e5e8a6d9f77946846d67b /src/vppinfra/dlmalloc.h | |
| parent | d897adcebb0085942cbade024c3ccd8bafd448ef (diff) | |
Rename struct mallinfo -> struct dlmallinfo
Also: don't #include /usr/include/malloc.h in dlmalloc.h
Change-Id: Ic73ff8862cc8aba371488b912255e28dd96374ff
Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'src/vppinfra/dlmalloc.h')
| -rw-r--r-- | src/vppinfra/dlmalloc.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vppinfra/dlmalloc.h b/src/vppinfra/dlmalloc.h index b8e32367400..e710b0c56ca 100644 --- a/src/vppinfra/dlmalloc.h +++ b/src/vppinfra/dlmalloc.h @@ -768,14 +768,14 @@ MAX_RELEASE_CHECK_RATE default: 4095 unless not HAVE_MMAP /* #define HAVE_USR_INCLUDE_MALLOC_H */ -#ifdef HAVE_USR_INCLUDE_MALLOC_H +#if 0 // def HAVE_USR_INCLUDE_MALLOC_H #include "/usr/include/malloc.h" #else /* HAVE_USR_INCLUDE_MALLOC_H */ #ifndef STRUCT_MALLINFO_DECLARED /* HP-UX (and others?) redefines mallinfo unless _STRUCT_MALLINFO is defined */ #define _STRUCT_MALLINFO #define STRUCT_MALLINFO_DECLARED 1 -struct mallinfo { +struct dlmallinfo { MALLINFO_FIELD_TYPE arena; /* non-mmapped space allocated from system */ MALLINFO_FIELD_TYPE ordblks; /* number of free chunks */ MALLINFO_FIELD_TYPE smblks; /* always 0 */ @@ -837,7 +837,7 @@ extern "C" { #define dlrealloc_in_place realloc_in_place #define dlvalloc valloc #define dlpvalloc pvalloc -#define dlmallinfo mallinfo +// #define dlmallinfo mallinfo #define dlmallopt mallopt #define dlmalloc_trim malloc_trim #define dlmalloc_stats malloc_stats @@ -1084,7 +1084,7 @@ DLMALLOC_EXPORT void dlmalloc_inspect_all(void(*handler)(void*, void *, size_t, be kept as longs, the reported values may wrap around zero and thus be inaccurate. */ -DLMALLOC_EXPORT struct mallinfo dlmallinfo(void); +DLMALLOC_EXPORT struct dlmallinfo dlmallinfo(void); #endif /* NO_MALLINFO */ /* @@ -1401,7 +1401,7 @@ DLMALLOC_EXPORT size_t mspace_max_footprint(mspace msp); mspace_mallinfo behaves as mallinfo, but reports properties of the given space. */ -DLMALLOC_EXPORT struct mallinfo mspace_mallinfo(mspace msp); +DLMALLOC_EXPORT struct dlmallinfo mspace_mallinfo(mspace msp); #endif /* NO_MALLINFO */ /* |