X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Ftypes.h;h=897abaed89049fdf901fa83ca4754674ebb48483;hb=9df71462f1663e01d6f4317c60b2f5ae1c4fe1da;hp=c262b58d94f8f68e5f9d46bb1b590cf31f13f5c8;hpb=284978b1dc258cb8cd2a32d6a0f25f2f9b284149;p=m6w6%2Flibmemcached

diff --git a/libmemcached/types.h b/libmemcached/types.h
index c262b58d..897abaed 100644
--- a/libmemcached/types.h
+++ b/libmemcached/types.h
@@ -16,12 +16,23 @@ 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;
+
+// All of the flavors of memcache_server_st
 typedef struct memcached_server_st memcached_server_st;
+typedef const struct memcached_server_st *memcached_server_instance_st;
+typedef struct memcached_server_st *memcached_server_list_st;
+
 typedef struct memcached_callback_st memcached_callback_st;
 
+// The following two structures are internal, and never exposed to users.
 typedef struct memcached_string_st memcached_string_st;
 typedef struct memcached_continuum_item_st memcached_continuum_item_st;
 
+
+#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);
 
@@ -33,8 +44,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.
@@ -50,7 +62,10 @@ typedef memcached_return_t (*memcached_dump_fn)(const memcached_st *ptr,
                                                 size_t key_length,
                                                 void *context);
 
- 
+#ifdef __cplusplus
+}
+#endif
+
 /**
   @note The following definitions are just here for backwards compatibility.
 */