Merge

[m6w6/libmemcached] / include / memcached.h

diff --git a/include/memcached.h b/include/memcached.h
index aa93b3b3ca38716a9414812d11027df5f065c1f5..a3721dee14f0770e53424451ed03f3428a51c0fa 100644 (file)
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -72,8 +72,8 @@ typedef struct memcached_stat_st memcached_stat_st;
 typedef struct memcached_result_st memcached_result_st;
 typedef struct memcached_string_st memcached_string_st;
 typedef struct memcached_server_st memcached_server_st;
-typedef memcached_return (*clone_func)(memcached_st *parent, memcached_st *clone);
-typedef memcached_return (*cleanup_func)(memcached_st *ptr);
+typedef memcached_return (*memcached_clone_func)(memcached_st *parent, memcached_st *clone);
+typedef memcached_return (*memcached_cleanup_func)(memcached_st *ptr);
 typedef void (*memcached_free_function)(memcached_st *ptr, void *mem);
 typedef void *(*memcached_malloc_function)(memcached_st *ptr, const size_t size);
 typedef void *(*memcached_realloc_function)(memcached_st *ptr, void *mem, const size_t size);
@@ -216,8 +216,8 @@ struct memcached_st {
   memcached_server_distribution distribution;
   void *user_data;
   unsigned int wheel[MEMCACHED_WHEEL_SIZE];
-  clone_func on_clone;
-  cleanup_func on_cleanup;
+  memcached_clone_func on_clone;
+  memcached_cleanup_func on_cleanup;
   memcached_free_function call_free;
   memcached_malloc_function call_malloc;
   memcached_realloc_function call_realloc;