rsys

commit 575ac05d38e2946628bcf8ff3a4cbbfe7ec58955
parent ea0011df44db6ff881916238bf33ff6e82e1c153
Author: vaplv <vaplv@free.fr>
Date:   Wed, 20 May 2015 11:29:36 +0200

Rename the free mem_allocator function in rm

Diffstat:
M
src/mem_allocator.c
 | 
2
+-
M
src/mem_allocator.h
 | 
4
++--

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mem_allocator.c b/src/mem_allocator.c
@@ -669,7 +669,7 @@ mem_init_proxy_allocator
   proxy_allocator->realloc = proxy_realloc;
   proxy_allocator->mem_size = proxy_mem_size;
   proxy_allocator->alloc_aligned = proxy_alloc_aligned;
-  proxy_allocator->free = proxy_free;
+  proxy_allocator->rm = proxy_free;
   proxy_allocator->allocated_size = proxy_allocated_size;
   proxy_allocator->dump = proxy_dump;
   proxy_allocator->data = (void*)proxy_data;
diff --git a/src/mem_allocator.h b/src/mem_allocator.h
@@ -50,7 +50,7 @@ struct mem_allocator {
      const char* filename,
      const unsigned int fileline);
 
-  void (*free)
+  void (*rm)
     (void* data,
      void* mem);
 
@@ -86,7 +86,7 @@ struct mem_allocator {
    ((Allocator)->data, (Size), (Alignment), __FILE__, __LINE__))
 
 #define MEM_RM(Allocator, Mem)                                                 \
-  ((Allocator)->free((Allocator)->data, (void*)(Mem)))
+  ((Allocator)->rm((Allocator)->data, (void*)(Mem)))
 
 #define MEM_SIZE(Allocator, Mem)                                               \
   ((Allocator)->mem_size((Allocator)->data, (Mem)))