diff options
| author |   David Johnson <davijoh3@cisco.com> | 2018-12-14 14:53:41 -0500 |
|---|---|---|
| committer | David Johnson <davijoh3@cisco.com> | 2019-01-02 10:55:55 -0500 |
| commit | d9818dd68c162079f3ddb5443a78d0d91d55d0fe (patch) | |
| tree | 71a597e8fb2c9c7ebd70870ae78091872591e216 /src/vppinfra/dlmalloc.h | |
| parent | d6897c1597c4f0904d5956f7d794e3f001d52f72 (diff) | |
Fixes for buliding for 32bit targets:
* u32/u64/uword mismatches
* pointer-to-int fixes
* printf formatting issues
* issues with incorrect "ULL" and related suffixes
* structure alignment and padding issues
Change-Id: I70b989007758755fe8211c074f651150680f60b4
Signed-off-by: David Johnson <davijoh3@cisco.com>
Diffstat (limited to 'src/vppinfra/dlmalloc.h')
| -rw-r--r-- | src/vppinfra/dlmalloc.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/vppinfra/dlmalloc.h b/src/vppinfra/dlmalloc.h index b7a8eea80a0..216df4737ca 100644 --- a/src/vppinfra/dlmalloc.h +++ b/src/vppinfra/dlmalloc.h @@ -1448,22 +1448,20 @@ DLMALLOC_EXPORT int mspace_trim(mspace msp, size_t pad); DLMALLOC_EXPORT int mspace_mallopt(int, int); DLMALLOC_EXPORT void* mspace_get_aligned (mspace msp, - unsigned long long n_user_data_bytes, - unsigned long long align, - unsigned long long align_offset); + unsigned long n_user_data_bytes, + unsigned long align, + unsigned long align_offset); DLMALLOC_EXPORT int mspace_is_heap_object (mspace msp, void *p); -DLMALLOC_EXPORT void mspace_get_address_and_size (mspace msp, - unsigned long long *addrp, - unsigned long long *sizep); +DLMALLOC_EXPORT void mspace_get_address_and_size (mspace msp, char **addrp, size_t *sizep); DLMALLOC_EXPORT void mspace_put (mspace msp, void *p); DLMALLOC_EXPORT void mspace_put_no_offset (mspace msp, void *p); DLMALLOC_EXPORT size_t mspace_usable_size_with_delta (const void *p); DLMALLOC_EXPORT void mspace_disable_expand (mspace msp); DLMALLOC_EXPORT void *mspace_least_addr (mspace msp); -DLMALLOC_EXPORT void mheap_get_trace (u64 offset, u64 size); -DLMALLOC_EXPORT void mheap_put_trace (u64 offset, u64 size); +DLMALLOC_EXPORT void mheap_get_trace (uword offset, uword size); +DLMALLOC_EXPORT void mheap_put_trace (uword offset, uword size); DLMALLOC_EXPORT int mspace_enable_disable_trace (mspace msp, int enable); #endif /* MSPACES */ |