X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Ftypes.h;h=b3d8f4791f9c2a54a21a937cc3422208ebafc5ee;hb=fd151d70d25ba4cae4f90a1e57435a8cc72e9c09;hp=deaf2f49dc7f7a21a390f886843d33c86ec12525;hpb=e36367e4c27fc5537d437c4a4ea741f57426b37d;p=m6w6%2Flibmemcached

diff --git a/libmemcached/types.h b/libmemcached/types.h
index deaf2f49..b3d8f479 100644
--- a/libmemcached/types.h
+++ b/libmemcached/types.h
@@ -9,6 +9,7 @@
  *
  */
 
+#pragma once
 #ifndef __LIBMEMCACHED_TYPES_H__
 #define __LIBMEMCACHED_TYPES_H__
 
@@ -16,10 +17,19 @@ 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_array_st memcached_array_st;
+typedef struct memcached_error_t memcached_error_t;
+
+// 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_string_t memcached_string_t;
 typedef struct memcached_continuum_item_st memcached_continuum_item_st;
 
 
@@ -40,7 +50,11 @@ typedef void *(*memcached_calloc_fn)(const memcached_st *ptr, size_t nelem, cons
 
 
 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);
+typedef memcached_return_t (*memcached_stat_fn)(memcached_server_instance_st server,
+                                                const char *key, size_t key_length,
+                                                const char *value, size_t value_length,
+                                                void *context);
 
 /**
   Trigger functions.