projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge pull request #92 from gitter-badger/gitter-badge
[m6w6/libmemcached]
/
tests
/
libmemcached-1.0
/
print.cc
diff --git
a/tests/libmemcached-1.0/print.cc
b/tests/libmemcached-1.0/print.cc
index f1c03d07eec33dd08c76b1d18938407329bfec7e..1e948eb48c94aff30abf7f47983d544c56eabe43 100644
(file)
--- a/
tests/libmemcached-1.0/print.cc
+++ b/
tests/libmemcached-1.0/print.cc
@@
-35,20
+35,20
@@
*
*/
*
*/
-#include
<config.h>
-#include
<libtest/test.hpp>
+#include
"mem_config.h"
+#include
"libtest/test.hpp"
using namespace libtest;
#include <iostream>
using namespace libtest;
#include <iostream>
-#include
<libmemcached/memcached.h>
+#include
"libmemcached-1.0/memcached.h"
#include "tests/print.h"
memcached_return_t server_print_callback(const memcached_st*,
#include "tests/print.h"
memcached_return_t server_print_callback(const memcached_st*,
-
memcached_server_instance_st
server,
+
const memcached_instance_st *
server,
void *context)
{
if (context)
void *context)
{
if (context)
@@
-59,18
+59,8
@@
memcached_return_t server_print_callback(const memcached_st*,
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
-const char * print_version(memcached_st *memc)
-{
- memcached_server_fn callbacks[1];
- callbacks[0]= server_print_version_callback;
- memcached_server_cursor(memc, callbacks, NULL, 1);
-
- return "print_version()";
-}
-
-
memcached_return_t server_print_version_callback(const memcached_st *,
memcached_return_t server_print_version_callback(const memcached_st *,
-
memcached_server_instance_st
server,
+
const memcached_instance_st *
server,
void *)
{
std::cerr << "Server: " << memcached_server_name(server) << ":" << memcached_server_port(server) << " "
void *)
{
std::cerr << "Server: " << memcached_server_name(server) << ":" << memcached_server_port(server) << " "
@@
-81,3
+71,12
@@
memcached_return_t server_print_version_callback(const memcached_st *,
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
+
+const char * print_version(memcached_st *memc)
+{
+ memcached_server_fn callbacks[1];
+ callbacks[0]= server_print_version_callback;
+ memcached_server_cursor(memc, callbacks, NULL, 1);
+
+ return "print_version()";
+}