From: Padraig O'Sullivan Date: Tue, 14 Jul 2009 02:17:13 +0000 (-0400) Subject: Resolving build issues on Mac OSX. Some variables were shadowing global X-Git-Tag: 0.32~19^2 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=20271f164081910db33e2237a1e1faea226ac6b6;p=m6w6%2Flibmemcached Resolving build issues on Mac OSX. Some variables were shadowing global declarations from included files. --- diff --git a/clients/memstat.c b/clients/memstat.c index 817b9f6d..27c34a41 100644 --- a/clients/memstat.c +++ b/clients/memstat.c @@ -19,9 +19,9 @@ /* Prototypes */ static void options_parse(int argc, char *argv[]); -static void run_analyzer(memcached_st *memc, memcached_stat_st *stat, +static void run_analyzer(memcached_st *memc, memcached_stat_st *memc_stat, memcached_server_st *server_list); -static void print_server_listing(memcached_st *memc, memcached_stat_st *stat, +static void print_server_listing(memcached_st *memc, memcached_stat_st *memc_stat, memcached_server_st *server_list); static void print_analysis_report(memcached_st *memc, memcached_analysis_st *report, diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h index 0511c9df..3c391544 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); @@ -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 diff --git a/libmemcached/memcached_server.h b/libmemcached/memcached_server.h index fa79df8f..8076877e 100644 --- a/libmemcached/memcached_server.h +++ b/libmemcached/memcached_server.h @@ -73,7 +73,7 @@ void memcached_server_free(memcached_server_st *ptr); LIBMEMCACHED_API memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcached_server_st *ptr); LIBMEMCACHED_API -memcached_analysis_st *memcached_analyze(memcached_st *memc, memcached_stat_st *stat, +memcached_analysis_st *memcached_analyze(memcached_st *memc, memcached_stat_st *memc_stat, memcached_return *error); LIBMEMCACHED_API