X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Ftypes.h;h=56adf1e0a0552870b8408eeaf9c91dd0ae310c29;hb=c29c787187baac1f403668a5dbf8ba481b9a8c8e;hp=28182cd94432bc213e1b0e8b919ca0a1dc2dc148;hpb=a4456cc10079f2e6f648befc91657f2723c825e5;p=m6w6%2Flibmemcached

diff --git a/libmemcached/types.h b/libmemcached/types.h
index 28182cd9..56adf1e0 100644
--- a/libmemcached/types.h
+++ b/libmemcached/types.h
@@ -9,22 +9,27 @@
  *
  */
 
-#ifndef LIBMEMCACHED_MEMCACHED_TYPES_H
-#define LIBMEMCACHED_MEMCACHED_TYPES_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef __LIBMEMCACHED_TYPES_H__
+#define __LIBMEMCACHED_TYPES_H__
 
 typedef struct memcached_st memcached_st;
 typedef struct memcached_stat_st memcached_stat_st;
 typedef struct memcached_analysis_st memcached_analysis_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 const struct memcached_server_st * memcached_server_instance_st;
+
+typedef struct memcached_callback_st memcached_callback_st;
+
+typedef struct memcached_string_st memcached_string_st;
 typedef struct memcached_continuum_item_st memcached_continuum_item_st;
 
-typedef memcached_return_t (*memcached_clone_fn)(memcached_st *parent, memcached_st *clone);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef memcached_return_t (*memcached_clone_fn)(memcached_st *destination, const memcached_st *source);
 typedef memcached_return_t (*memcached_cleanup_fn)(const memcached_st *ptr);
 
 /**
@@ -35,8 +40,9 @@ typedef void *(*memcached_malloc_fn)(const memcached_st *ptr, const size_t size,
 typedef void *(*memcached_realloc_fn)(const memcached_st *ptr, void *mem, const size_t size, void *context);
 typedef void *(*memcached_calloc_fn)(const memcached_st *ptr, size_t nelem, const size_t elsize, void *context);
 
+
 typedef memcached_return_t (*memcached_execute_fn)(const memcached_st *ptr, memcached_result_st *result, void *context);
-typedef memcached_return_t (*memcached_server_fn)(const memcached_st *ptr, memcached_server_st *server, void *context);
+typedef memcached_return_t (*memcached_server_fn)(const memcached_st *ptr, memcached_server_instance_st server, void *context);
 
 /**
   Trigger functions.
@@ -52,13 +58,10 @@ typedef memcached_return_t (*memcached_dump_fn)(const memcached_st *ptr,
                                                 size_t key_length,
                                                 void *context);
 
-typedef struct {
-  memcached_execute_fn *callback;
-  void *context;
-  uint32_t number_of_callback;
-} memcached_callback_st;
+#ifdef __cplusplus
+}
+#endif
 
- 
 /**
   @note The following definitions are just here for backwards compatibility.
 */
@@ -70,19 +73,10 @@ typedef memcached_hash_t memcached_hash;
 typedef memcached_connection_t memcached_connection;
 typedef memcached_clone_fn memcached_clone_func;
 typedef memcached_cleanup_fn memcached_cleanup_func;
-typedef memcached_free_fn memcached_free_function;
-typedef memcached_malloc_fn memcached_malloc_function;
-typedef memcached_realloc_fn memcached_realloc_function;
-typedef memcached_calloc_fn memcached_calloc_function;
 typedef memcached_execute_fn memcached_execute_function;
 typedef memcached_server_fn memcached_server_function;
 typedef memcached_trigger_key_fn memcached_trigger_key;
 typedef memcached_trigger_delete_key_fn memcached_trigger_delete_key;
 typedef memcached_dump_fn memcached_dump_func;
- 
-
-#ifdef __cplusplus
-}
-#endif
 
-#endif /* LIBMEMCACHED_MEMCACHED_TYPES_H */
+#endif /* __LIBMEMCACHED_TYPES_H__ */