libmemcached

Merge lp://staging/~posulliv/libmemcached/mac-build-fixes into lp://staging/~tangent-org/libmemcached/trunk

  1. mac-build-fixes
  2. Merge into trunk
Proposed by Padraig O'Sullivan
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~posulliv/libmemcached/mac-build-fixes
Merge into: lp://staging/~tangent-org/libmemcached/trunk
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~posulliv/libmemcached/mac-build-fixes
Reviewer Review Type Date Requested Status
Libmemcached-developers Pending
Review via email: mp+8722@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Padraig O'Sullivan (posulliv) wrote :

This patch resolves build issues that were occuring on Mac OSX.

-Padraig

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'clients/memstat.c'
--- clients/memstat.c 2009-06-14 21:24:48 +0000
+++ clients/memstat.c 2009-07-14 02:17:13 +0000
@@ -19,9 +19,9 @@
1919
20/* Prototypes */20/* Prototypes */
21static void options_parse(int argc, char *argv[]);21static void options_parse(int argc, char *argv[]);
22static void run_analyzer(memcached_st *memc, memcached_stat_st *stat,22static void run_analyzer(memcached_st *memc, memcached_stat_st *memc_stat,
23 memcached_server_st *server_list);23 memcached_server_st *server_list);
24static void print_server_listing(memcached_st *memc, memcached_stat_st *stat,24static void print_server_listing(memcached_st *memc, memcached_stat_st *memc_stat,
25 memcached_server_st *server_list);25 memcached_server_st *server_list);
26static void print_analysis_report(memcached_st *memc,26static void print_analysis_report(memcached_st *memc,
27 memcached_analysis_st *report,27 memcached_analysis_st *report,
2828
=== modified file 'libmemcached/memcached.h'
--- libmemcached/memcached.h 2009-07-10 16:22:42 +0000
+++ libmemcached/memcached.h 2009-07-14 02:17:13 +0000
@@ -163,7 +163,7 @@
163LIBMEMCACHED_API163LIBMEMCACHED_API
164memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return *error);164memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return *error);
165LIBMEMCACHED_API165LIBMEMCACHED_API
166memcached_return memcached_stat_servername(memcached_stat_st *stat, char *args, 166memcached_return memcached_stat_servername(memcached_stat_st *memc_stat, char *args,
167 char *hostname, unsigned int port);167 char *hostname, unsigned int port);
168LIBMEMCACHED_API168LIBMEMCACHED_API
169memcached_return memcached_flush(memcached_st *ptr, time_t expiration);169memcached_return memcached_flush(memcached_st *ptr, time_t expiration);
@@ -235,10 +235,10 @@
235memcached_server_st *memcached_servers_parse(const char *server_strings);235memcached_server_st *memcached_servers_parse(const char *server_strings);
236236
237LIBMEMCACHED_API237LIBMEMCACHED_API
238char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat, 238char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *memc_stat,
239 const char *key, memcached_return *error);239 const char *key, memcached_return *error);
240LIBMEMCACHED_API240LIBMEMCACHED_API
241char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat, 241char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *memc_stat,
242 memcached_return *error);242 memcached_return *error);
243243
244LIBMEMCACHED_API244LIBMEMCACHED_API
245245
=== modified file 'libmemcached/memcached_server.h'
--- libmemcached/memcached_server.h 2009-07-06 17:20:04 +0000
+++ libmemcached/memcached_server.h 2009-07-14 02:17:13 +0000
@@ -73,7 +73,7 @@
73LIBMEMCACHED_API73LIBMEMCACHED_API
74memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcached_server_st *ptr);74memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcached_server_st *ptr);
75LIBMEMCACHED_API75LIBMEMCACHED_API
76memcached_analysis_st *memcached_analyze(memcached_st *memc, memcached_stat_st *stat,76memcached_analysis_st *memcached_analyze(memcached_st *memc, memcached_stat_st *memc_stat,
77 memcached_return *error);77 memcached_return *error);
7878
79LIBMEMCACHED_API79LIBMEMCACHED_API

Subscribers

People subscribed via source and target branches