diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-06-21 05:29:20 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-29 16:46:30 +0300 |
| commit | 92474fbb636ce67a962b3f341d5c5eed3e78c6a7 (patch) | |
| tree | ba85f3a7486a053229d5e03660d1ead676faa34e | |
| parent | 55c021a5a72ee19df63cbe4e329e29b7400145f2 (diff) | |
Support for platforms /wo malloc_usable_size
Was only used for stats, netbsd doesn't define this function.
| -rw-r--r-- | intern/guardedalloc/intern/mallocn_guarded_impl.c | 2 | ||||
| -rw-r--r-- | intern/guardedalloc/intern/mallocn_intern.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/intern/guardedalloc/intern/mallocn_guarded_impl.c b/intern/guardedalloc/intern/mallocn_guarded_impl.c index 88d6f35d438..1933e9d3ee3 100644 --- a/intern/guardedalloc/intern/mallocn_guarded_impl.c +++ b/intern/guardedalloc/intern/mallocn_guarded_impl.c @@ -711,10 +711,12 @@ void MEM_guarded_printmemlist_stats(void) totpb++; pb++; +#ifdef USE_MALLOC_USABLE_SIZE if (!membl->mmap && membl->alignment == 0) { mem_in_use_slop += (sizeof(MemHead) + sizeof(MemTail) + malloc_usable_size((void *)membl)) - membl->len; } +#endif if (membl->next) membl = MEMNEXT(membl->next); diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h index 6cab1f01b70..3f7e462c1c7 100644 --- a/intern/guardedalloc/intern/mallocn_intern.h +++ b/intern/guardedalloc/intern/mallocn_intern.h @@ -50,6 +50,7 @@ #endif #undef HAVE_MALLOC_STATS +#define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */ #if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || defined(__GLIBC__) # include <malloc.h> @@ -63,7 +64,8 @@ # include <malloc.h> # define malloc_usable_size _msize #else -# error "We don't know how to use malloc_usable_size on your platform" +# pragma message "We don't know how to use malloc_usable_size on your platform" +# undef USE_MALLOC_USABLE_SIZE #endif /* Blame Microsoft for LLP64 and no inttypes.h, quick workaround needed: */ |