libmemcached

Merge lp:~mordred/libmemcached/fix-freebsd-build into lp:~tangent-org/libmemcached/trunk

  1. fix-freebsd-build
  2. Merge into trunk
Proposed by Monty Taylor
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mordred/libmemcached/fix-freebsd-build
Merge into: lp:~tangent-org/libmemcached/trunk
Diff against target: 197 lines (+32/-32)
6 files modified
libmemcached/behavior.c (+1/-1)
libmemcached/memcached.c (+2/-2)
libmemcached/result.c (+8/-8)
libmemcached/server.c (+5/-5)
libmemcached/server_list.c (+3/-3)
libmemcached/string.c (+13/-13)
To merge this branch: bzr merge lp:~mordred/libmemcached/fix-freebsd-build
Reviewer Review Type Date Requested Status
Brian Aker Pending
Review via email: mp+22718@code.launchpad.net

Description of the change

Fixes the FreeBSD build.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libmemcached/behavior.c'
2--- libmemcached/behavior.c 2010-02-13 02:23:49 +0000
3+++ libmemcached/behavior.c 2010-04-02 18:16:27 +0000
4@@ -230,7 +230,7 @@
5 return MEMCACHED_SUCCESS;
6 }
7
8-inline bool _is_auto_eject_host(const memcached_st *ptr)
9+bool _is_auto_eject_host(const memcached_st *ptr)
10 {
11 return ptr->flags.auto_eject_hosts;
12 }
13
14=== modified file 'libmemcached/memcached.c'
15--- libmemcached/memcached.c 2010-03-03 10:50:13 +0000
16+++ libmemcached/memcached.c 2010-04-02 18:16:27 +0000
17@@ -298,12 +298,12 @@
18 return memcached_server_push(destination, source->servers);
19 }
20
21-inline memcached_server_write_instance_st memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key)
22+memcached_server_write_instance_st memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key)
23 {
24 return &ptr->servers[server_key];
25 }
26
27-inline memcached_server_instance_st memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key)
28+memcached_server_instance_st memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key)
29 {
30 return &ptr->servers[server_key];
31 }
32
33=== modified file 'libmemcached/result.c'
34--- libmemcached/result.c 2010-02-12 19:23:18 +0000
35+++ libmemcached/result.c 2010-04-02 18:16:27 +0000
36@@ -95,44 +95,44 @@
37 return memcached_string_append(&ptr->value, value, length);
38 }
39
40-inline const char *memcached_result_key_value(const memcached_result_st *self)
41+const char *memcached_result_key_value(const memcached_result_st *self)
42 {
43 return self->key_length ? self->item_key : NULL;
44 }
45
46-inline size_t memcached_result_key_length(const memcached_result_st *self)
47+size_t memcached_result_key_length(const memcached_result_st *self)
48 {
49 return self->key_length;
50 }
51
52-inline const char *memcached_result_value(const memcached_result_st *self)
53+const char *memcached_result_value(const memcached_result_st *self)
54 {
55 const memcached_string_st *sptr= &self->value;
56 return memcached_string_value(sptr);
57 }
58
59-inline size_t memcached_result_length(const memcached_result_st *self)
60+size_t memcached_result_length(const memcached_result_st *self)
61 {
62 const memcached_string_st *sptr= &self->value;
63 return memcached_string_length(sptr);
64 }
65
66-inline uint32_t memcached_result_flags(const memcached_result_st *self)
67+uint32_t memcached_result_flags(const memcached_result_st *self)
68 {
69 return self->item_flags;
70 }
71
72-inline uint64_t memcached_result_cas(const memcached_result_st *self)
73+uint64_t memcached_result_cas(const memcached_result_st *self)
74 {
75 return self->item_cas;
76 }
77
78-inline void memcached_result_set_flags(memcached_result_st *self, uint32_t flags)
79+void memcached_result_set_flags(memcached_result_st *self, uint32_t flags)
80 {
81 self->item_flags= flags;
82 }
83
84-inline void memcached_result_set_expiration(memcached_result_st *self, time_t expiration)
85+void memcached_result_set_expiration(memcached_result_st *self, time_t expiration)
86 {
87 self->item_expiration= expiration;
88 }
89
90=== modified file 'libmemcached/server.c'
91--- libmemcached/server.c 2010-02-17 01:58:35 +0000
92+++ libmemcached/server.c 2010-04-02 18:16:27 +0000
93@@ -237,27 +237,27 @@
94 }
95 }
96
97-inline uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
98+uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count)
99 {
100 return servers->number_of_hosts= count;
101 }
102
103-inline uint32_t memcached_server_count(const memcached_st *self)
104+uint32_t memcached_server_count(const memcached_st *self)
105 {
106 return self->number_of_hosts;
107 }
108
109-inline const char *memcached_server_name(memcached_server_instance_st self)
110+const char *memcached_server_name(memcached_server_instance_st self)
111 {
112 return self->hostname;
113 }
114
115-inline in_port_t memcached_server_port(memcached_server_instance_st self)
116+in_port_t memcached_server_port(memcached_server_instance_st self)
117 {
118 return self->port;
119 }
120
121-inline uint32_t memcached_server_response_count(memcached_server_instance_st self)
122+uint32_t memcached_server_response_count(memcached_server_instance_st self)
123 {
124 return self->cursor_active;
125 }
126
127=== modified file 'libmemcached/server_list.c'
128--- libmemcached/server_list.c 2010-02-17 01:58:35 +0000
129+++ libmemcached/server_list.c 2010-04-02 18:16:27 +0000
130@@ -59,19 +59,19 @@
131 return memcached_server_list_append_with_weight(ptr, hostname, port, 0, error);
132 }
133
134-inline uint32_t memcached_server_list_count(const memcached_server_list_st self)
135+uint32_t memcached_server_list_count(const memcached_server_list_st self)
136 {
137 return (self == NULL)
138 ? 0
139 : self->number_of_hosts;
140 }
141
142-inline memcached_server_st *memcached_server_list(const memcached_st *self)
143+memcached_server_st *memcached_server_list(const memcached_st *self)
144 {
145 return self->servers;
146 }
147
148-inline void memcached_server_list_set(memcached_st *self, memcached_server_st *list)
149+void memcached_server_list_set(memcached_st *self, memcached_server_st *list)
150 {
151 self->servers= list;
152 }
153
154=== modified file 'libmemcached/string.c'
155--- libmemcached/string.c 2010-02-13 02:23:49 +0000
156+++ libmemcached/string.c 2010-04-02 18:16:27 +0000
157@@ -177,27 +177,27 @@
158 return _string_check(string, need);
159 }
160
161-inline size_t memcached_string_length(const memcached_string_st *self)
162+size_t memcached_string_length(const memcached_string_st *self)
163 {
164 return (size_t)(self->end - self->string);
165 }
166
167-inline size_t memcached_string_size(const memcached_string_st *self)
168+size_t memcached_string_size(const memcached_string_st *self)
169 {
170 return self->current_size;
171 }
172
173-inline const char *memcached_string_value(const memcached_string_st *self)
174-{
175- return self->string;
176-}
177-
178-inline char *memcached_string_value_mutable(const memcached_string_st *self)
179-{
180- return self->string;
181-}
182-
183-inline void memcached_string_set_length(memcached_string_st *self, size_t length)
184+const char *memcached_string_value(const memcached_string_st *self)
185+{
186+ return self->string;
187+}
188+
189+char *memcached_string_value_mutable(const memcached_string_st *self)
190+{
191+ return self->string;
192+}
193+
194+void memcached_string_set_length(memcached_string_st *self, size_t length)
195 {
196 self->end= self->string + length;
197 }

Subscribers

People subscribed via source and target branches

to all changes: