X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=tests%2Flibmemcached-1.0%2Fprint.cc;h=1e948eb48c94aff30abf7f47983d544c56eabe43;hb=a50984cac2e98548fa9188ec81f663b56732ac94;hp=13c4e1d0268b7b54db9577d8b12ec2dd84b7ae1e;hpb=f2a04f4573b52436413d1d413be0fc18eacfa8ee;p=awesomized%2Flibmemcached

diff --git a/tests/libmemcached-1.0/print.cc b/tests/libmemcached-1.0/print.cc
index 13c4e1d0..1e948eb4 100644
--- 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>
 
-#include <libmemcached/memcached.h>
+#include "libmemcached-1.0/memcached.h"
 
 #include "tests/print.h"
 
 memcached_return_t server_print_callback(const memcached_st*,
-                                         const memcached_server_st *server,
+                                         const memcached_instance_st * server,
                                          void *context)
 {
   if (context)
@@ -59,25 +59,24 @@ memcached_return_t server_print_callback(const memcached_st*,
   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 *,
-                                                 const memcached_server_st *server,
+                                                 const memcached_instance_st * server,
                                                  void *)
 {
   std::cerr << "Server: " << memcached_server_name(server) << ":" << memcached_server_port(server) << " " 
-    << int(server->major_version) << "."
-    << int(server->minor_version) << "."
-    << int(server->micro_version)
+    << int(memcached_server_major_version(server)) << "."
+    << int(memcached_server_minor_version(server)) << "."
+    << int(memcached_server_micro_version(server))
     << std::endl;
 
   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()";
+}