X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Fmemcached_allocators.c;h=767371cb72a66dabd20627ba77bd49251927e5bb;hb=b4de8d3fd063b9017797dd9809ab3acb8a537606;hp=3192f9e9f5ff6fe9b87cb0324352bf47a04714c0;hpb=921abbe1906e77cc18cbe8859bc5afe9494d780e;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached_allocators.c b/libmemcached/memcached_allocators.c
index 3192f9e9..767371cb 100644
--- a/libmemcached/memcached_allocators.c
+++ b/libmemcached/memcached_allocators.c
@@ -1,24 +1,24 @@
 #include "common.h"
 
-void libmemcached_free(memcached_st *ptr __attribute__((unused)), void *mem)
+void libmemcached_free(memcached_st *ptr, void *mem)
 {
+  (void) ptr;
   free(mem);
 }
 
-void *libmemcached_malloc(memcached_st *ptr __attribute__((unused)), 
-                          size_t size)
+void *libmemcached_malloc(memcached_st *ptr, size_t size)
 {
+  (void) ptr;
   return malloc(size);
 }
 
-void *libmemcached_realloc(memcached_st *ptr __attribute__((unused)), 
-                           void *mem, size_t size)
+void *libmemcached_realloc(memcached_st *ptr, void *mem, size_t size)
 {
+  (void) ptr;
   return realloc(mem, size);
 }
 
-void *libmemcached_calloc(memcached_st *ptr __attribute__((unused)), 
-                           size_t nelem, size_t size)
+void *libmemcached_calloc(memcached_st *ptr, size_t nelem, size_t size)
 {
   if (ptr->call_malloc != libmemcached_malloc)
   {
@@ -32,11 +32,11 @@ void *libmemcached_calloc(memcached_st *ptr __attribute__((unused)),
   return calloc(nelem, size);
 }
 
-memcached_return memcached_set_memory_allocators(memcached_st *ptr,
-                                                 memcached_malloc_function mem_malloc,
-                                                 memcached_free_function mem_free,
-                                                 memcached_realloc_function mem_realloc,
-                                                 memcached_calloc_function mem_calloc)
+memcached_return_t memcached_set_memory_allocators(memcached_st *ptr,
+                                                   memcached_malloc_fn mem_malloc,
+                                                   memcached_free_fn mem_free,
+                                                   memcached_realloc_fn mem_realloc,
+                                                   memcached_calloc_fn mem_calloc)
 {
   /* All should be set, or none should be set */
   if (mem_malloc == NULL && mem_free == NULL && mem_realloc == NULL && mem_calloc == NULL) 
@@ -60,10 +60,10 @@ memcached_return memcached_set_memory_allocators(memcached_st *ptr,
 }
 
 void memcached_get_memory_allocators(memcached_st *ptr,
-                                     memcached_malloc_function *mem_malloc,
-                                     memcached_free_function *mem_free,
-                                     memcached_realloc_function *mem_realloc,
-                                     memcached_calloc_function *mem_calloc)
+                                     memcached_malloc_fn *mem_malloc,
+                                     memcached_free_fn *mem_free,
+                                     memcached_realloc_fn *mem_realloc,
+                                     memcached_calloc_fn *mem_calloc)
 {
    *mem_malloc= ptr->call_malloc;
    *mem_free= ptr->call_free;