diff options
| -rw-r--r-- | event.c | 10 | ||||
| -rw-r--r-- | mm-internal.h | 19 |
2 files changed, 18 insertions, 11 deletions
@@ -2451,7 +2451,7 @@ static void *(*_mm_realloc_fn)(void *p, size_t sz) = NULL; static void (*_mm_free_fn)(void *p) = NULL; void * -mm_malloc(size_t sz) +event_mm_malloc_(size_t sz) { if (_mm_malloc_fn) return _mm_malloc_fn(sz); @@ -2460,7 +2460,7 @@ mm_malloc(size_t sz) } void * -mm_calloc(size_t count, size_t size) +event_mm_calloc_(size_t count, size_t size) { if (_mm_malloc_fn) { size_t sz = count * size; @@ -2473,7 +2473,7 @@ mm_calloc(size_t count, size_t size) } char * -mm_strdup(const char *str) +event_mm_strdup_(const char *str) { if (_mm_malloc_fn) { size_t ln = strlen(str); @@ -2490,7 +2490,7 @@ mm_strdup(const char *str) } void * -mm_realloc(void *ptr, size_t sz) +event_mm_realloc_(void *ptr, size_t sz) { if (_mm_realloc_fn) return _mm_realloc_fn(ptr, sz); @@ -2499,7 +2499,7 @@ mm_realloc(void *ptr, size_t sz) } void -mm_free(void *ptr) +event_mm_free_(void *ptr) { if (_mm_free_fn) _mm_free_fn(ptr); diff --git a/mm-internal.h b/mm-internal.h index 0d01a139..79855d6a 100644 --- a/mm-internal.h +++ b/mm-internal.h @@ -33,12 +33,19 @@ extern "C" { #endif #ifndef _EVENT_DISABLE_MM_REPLACEMENT -/* Internal use only: Memory allocation functions. */ -void *mm_malloc(size_t sz); -void *mm_calloc(size_t count, size_t size); -char *mm_strdup(const char *s); -void *mm_realloc(void *p, size_t sz); -void mm_free(void *p); +/* Internal use only: Memory allocation functions. We give them nice short + * mm_names for our own use, but make sure that the symbols have longer names + * so they don't conflict with other libraries (like, say, libmm). */ +void *event_mm_malloc_(size_t sz); +void *event_mm_calloc_(size_t count, size_t size); +char *event_mm_strdup_(const char *s); +void *event_mm_realloc_(void *p, size_t sz); +void event_mm_free_(void *p); +#define mm_malloc(sz) event_mm_malloc_(sz) +#define mm_calloc(count, size) event_mm_calloc_((count), (size)) +#define mm_strdup(s) event_mm_strdup_(s) +#define mm_realloc(p, sz) event_mm_realloc_((p), (sz)) +#define mm_free(p) event_mm_free_(p) #else #define mm_malloc(sz) malloc(sz) #define mm_calloc(n, sz) calloc((n), (sz)) |