Merge from trunk.

[m6w6/libmemcached] / libmemcached / memcached_get.h

diff --git a/libmemcached/memcached_get.h b/libmemcached/memcached_get.h
index 6e10ad182bc030b742f79eb6035b58eb2ed5c5d0..bf3aeb5333728459bf243ee4af50c0daa13004bb 100644 (file)
--- a/libmemcached/memcached_get.h
+++ b/libmemcached/memcached_get.h
@@ -23,7 +23,8 @@ char *memcached_get(memcached_st *ptr,
 
 LIBMEMCACHED_API
 memcached_return memcached_mget(memcached_st *ptr, 
-                                const char **keys, size_t *key_length, 
+                                const char * const *keys, 
+                                const size_t *key_length, 
                                 size_t number_of_keys);
 
 LIBMEMCACHED_API
@@ -38,8 +39,8 @@ LIBMEMCACHED_API
 memcached_return memcached_mget_by_key(memcached_st *ptr, 
                                        const char *master_key, size_t 
                                        master_key_length,
-                                       const char **keys, 
-                                       size_t *key_length, 
+                                       const char * const *keys, 
+                                       const size_t *key_length, 
                                        size_t number_of_keys);
 
 LIBMEMCACHED_API
@@ -55,15 +56,24 @@ memcached_result_st *memcached_fetch_result(memcached_st *ptr,
 
 LIBMEMCACHED_API
 memcached_return memcached_mget_execute(memcached_st *ptr,
-                                        const char *master_key,
-                                        size_t master_key_length,
-                                        const char **keys,
-                                        size_t *key_length,
+                                        const char * const *keys,
+                                        const size_t *key_length,
                                         size_t number_of_keys,
                                         memcached_execute_function *callback,
                                         void *context,
                                         unsigned int number_of_callbacks);
 
+LIBMEMCACHED_API
+memcached_return memcached_mget_execute_by_key(memcached_st *ptr,
+                                               const char *master_key,
+                                               size_t master_key_length,
+                                               const char * const *keys,
+                                               const size_t *key_length,
+                                               size_t number_of_keys,
+                                               memcached_execute_function *callback,
+                                               void *context,
+                                               unsigned int number_of_callbacks);
+
 #ifdef __cplusplus
 }
 #endif