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
1=== modified file 'clients/memstat.c'
2--- clients/memstat.c 2009-06-14 21:24:48 +0000
3+++ clients/memstat.c 2009-07-14 02:17:13 +0000
4@@ -19,9 +19,9 @@
5
6 /* Prototypes */
7 static void options_parse(int argc, char *argv[]);
8-static void run_analyzer(memcached_st *memc, memcached_stat_st *stat,
9+static void run_analyzer(memcached_st *memc, memcached_stat_st *memc_stat,
10 memcached_server_st *server_list);
11-static void print_server_listing(memcached_st *memc, memcached_stat_st *stat,
12+static void print_server_listing(memcached_st *memc, memcached_stat_st *memc_stat,
13 memcached_server_st *server_list);
14 static void print_analysis_report(memcached_st *memc,
15 memcached_analysis_st *report,
16
17=== modified file 'libmemcached/memcached.h'
18--- libmemcached/memcached.h 2009-07-10 16:22:42 +0000
19+++ libmemcached/memcached.h 2009-07-14 02:17:13 +0000
20@@ -163,7 +163,7 @@
21 LIBMEMCACHED_API
22 memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_return *error);
23 LIBMEMCACHED_API
24-memcached_return memcached_stat_servername(memcached_stat_st *stat, char *args,
25+memcached_return memcached_stat_servername(memcached_stat_st *memc_stat, char *args,
26 char *hostname, unsigned int port);
27 LIBMEMCACHED_API
28 memcached_return memcached_flush(memcached_st *ptr, time_t expiration);
29@@ -235,10 +235,10 @@
30 memcached_server_st *memcached_servers_parse(const char *server_strings);
31
32 LIBMEMCACHED_API
33-char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat,
34+char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *memc_stat,
35 const char *key, memcached_return *error);
36 LIBMEMCACHED_API
37-char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat,
38+char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *memc_stat,
39 memcached_return *error);
40
41 LIBMEMCACHED_API
42
43=== modified file 'libmemcached/memcached_server.h'
44--- libmemcached/memcached_server.h 2009-07-06 17:20:04 +0000
45+++ libmemcached/memcached_server.h 2009-07-14 02:17:13 +0000
46@@ -73,7 +73,7 @@
47 LIBMEMCACHED_API
48 memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcached_server_st *ptr);
49 LIBMEMCACHED_API
50-memcached_analysis_st *memcached_analyze(memcached_st *memc, memcached_stat_st *stat,
51+memcached_analysis_st *memcached_analyze(memcached_st *memc, memcached_stat_st *memc_stat,
52 memcached_return *error);
53
54 LIBMEMCACHED_API

Subscribers

People subscribed via source and target branches