X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=c3b436bf2ff721481d5e1bf41de99f01d433ced4;hb=3ea13081582df1d4c1d9afe41804401c736e80c7;hp=0511c9df45fabf813cb494b524b2f2aa99369f8b;hpb=1856e4ce29a1551539753bfeceb62f4851132531;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 0511c9df..c3b436bf 100644
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -163,7 +163,7 @@ void memcached_stat_free(memcached_st *, memcached_stat_st *);
 LIBMEMCACHED_API
 memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return *error);
 LIBMEMCACHED_API
-memcached_return memcached_stat_servername(memcached_stat_st *stat, char *args, 
+memcached_return memcached_stat_servername(memcached_stat_st *memc_stat, char *args, 
                                            char *hostname, unsigned int port);
 LIBMEMCACHED_API
 memcached_return memcached_flush(memcached_st *ptr, time_t expiration);
@@ -172,7 +172,7 @@ memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity);
 LIBMEMCACHED_API
 void memcached_quit(memcached_st *ptr);
 LIBMEMCACHED_API
-char *memcached_strerror(memcached_st *ptr, memcached_return rc);
+const char *memcached_strerror(memcached_st *ptr, memcached_return rc);
 LIBMEMCACHED_API
 memcached_return memcached_behavior_set(memcached_st *ptr, memcached_behavior flag, uint64_t data);
 LIBMEMCACHED_API
@@ -235,10 +235,10 @@ LIBMEMCACHED_API
 memcached_server_st *memcached_servers_parse(const char *server_strings);
 
 LIBMEMCACHED_API
-char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat, 
+char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *memc_stat, 
                                const char *key, memcached_return *error);
 LIBMEMCACHED_API
-char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat, 
+char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *memc_stat, 
                                 memcached_return *error);
 
 LIBMEMCACHED_API