projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merging bzr://gaz.tangent.org/libmemcached/build/ to Build branch
[awesomized/libmemcached]
/
libmemcached
/
common.h
diff --git
a/libmemcached/common.h
b/libmemcached/common.h
index 570735045823237e60442750dec3eebc129bc0b0..e6b24944e3c4388f3a1c0a44de90ec04e5fdff04 100644
(file)
--- a/
libmemcached/common.h
+++ b/
libmemcached/common.h
@@
-105,8
+105,9
@@
memcached_return_t memcached_server_execute(memcached_st *ptr,
#ifdef __cplusplus
#include <libmemcached/string.hpp>
#include <libmemcached/io.hpp>
#ifdef __cplusplus
#include <libmemcached/string.hpp>
#include <libmemcached/io.hpp>
+#include <libmemcached/udp.hpp>
#include <libmemcached/do.hpp>
#include <libmemcached/do.hpp>
-#include <libmemcached/
close_
socket.hpp>
+#include <libmemcached/socket.hpp>
#include <libmemcached/connect.hpp>
#include <libmemcached/allocators.hpp>
#include <libmemcached/hash.hpp>
#include <libmemcached/connect.hpp>
#include <libmemcached/allocators.hpp>
#include <libmemcached/hash.hpp>
@@
-133,6
+134,8
@@
memcached_return_t memcached_server_execute(memcached_st *ptr,
#include <libmemcached/assert.hpp>
#include <libmemcached/server.hpp>
#include <libmemcached/key.hpp>
#include <libmemcached/assert.hpp>
#include <libmemcached/server.hpp>
#include <libmemcached/key.hpp>
+#include <libmemcached/encoding_key.h>
+#include <libmemcached/result.h>
#endif
#include <libmemcached/continuum.hpp>
#endif
#include <libmemcached/continuum.hpp>
@@
-157,9
+160,6
@@
memcached_return_t memcached_server_execute(memcached_st *ptr,
extern "C" {
#endif
extern "C" {
#endif
-LIBMEMCACHED_LOCAL
-memcached_return_t memcached_connect(memcached_server_write_instance_st ptr);
-
LIBMEMCACHED_LOCAL
memcached_return_t run_distribution(memcached_st *ptr);
LIBMEMCACHED_LOCAL
memcached_return_t run_distribution(memcached_st *ptr);