diff options
| author | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
|---|---|---|
| committer | Peter Kim <pk15950@gmail.com> | 2022-09-08 07:00:12 +0300 |
| commit | 00dcfdf916c69672210b006e62d966f1bc2fbeb7 (patch) | |
| tree | 0cbb1b91fe26c750197126085b74224a795a103c /intern/guardedalloc/intern/mallocn_intern.h | |
| parent | a39532670f6b668da7be5810fb1f844b82feeba3 (diff) | |
| parent | d5934974219135102f364f57c45a8b1465e2b8d9 (diff) | |
Merge branch 'master' into xr-devxr-dev
Diffstat (limited to 'intern/guardedalloc/intern/mallocn_intern.h')
| -rw-r--r-- | intern/guardedalloc/intern/mallocn_intern.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h index f8b16ff6ddf..1e9883f42c8 100644 --- a/intern/guardedalloc/intern/mallocn_intern.h +++ b/intern/guardedalloc/intern/mallocn_intern.h @@ -17,8 +17,7 @@ #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__) +#if defined(HAVE_MALLOC_STATS_H) # include <malloc.h> # define HAVE_MALLOC_STATS #elif defined(__FreeBSD__) @@ -131,6 +130,7 @@ void MEM_lockfree_reset_peak_memory(void); size_t MEM_lockfree_get_peak_memory(void) ATTR_WARN_UNUSED_RESULT; #ifndef NDEBUG const char *MEM_lockfree_name_ptr(void *vmemh); +void MEM_lockfree_name_ptr_set(void *vmemh, const char *str); #endif /* Prototypes for fully guarded allocator functions */ @@ -174,6 +174,7 @@ void MEM_guarded_reset_peak_memory(void); size_t MEM_guarded_get_peak_memory(void) ATTR_WARN_UNUSED_RESULT; #ifndef NDEBUG const char *MEM_guarded_name_ptr(void *vmemh); +void MEM_guarded_name_ptr_set(void *vmemh, const char *str); #endif #ifdef __cplusplus |