Merge in updates to io

diff --git a/libmemcached/io.h b/libmemcached/io.h
index 0a05b92a99492f1a35531180c6194027c9d01938..3591de922badf79d8ca27e81457053b420abeea8 100644 (file)
--- a/libmemcached/io.h
+++ b/libmemcached/io.h
@@ -64,6 +64,10 @@ struct libmemcached_io_vector_st
   const void *buffer;
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 LIBMEMCACHED_LOCAL
 ssize_t memcached_io_write(memcached_server_write_instance_st ptr,
                            const void *buffer, size_t length, bool with_flush);
@@ -73,3 +77,6 @@ ssize_t memcached_io_writev(memcached_server_write_instance_st ptr,
                             const struct libmemcached_io_vector_st *vector,
                             size_t number_of, bool with_flush);
 
+#ifdef __cplusplus
+}
+#endif

diff --git a/libmemcached/io.hpp b/libmemcached/io.hpp
index 7413ac4b4d091032739ea8e4320b5bbe707173f7..23a4a6b412109812d1f761c9db4b5fe3442c5d5a 100644 (file)
--- a/libmemcached/io.hpp
+++ b/libmemcached/io.hpp
@@ -38,10 +38,6 @@
 
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 LIBMEMCACHED_LOCAL
 memcached_return_t memcached_io_wait_for_write(memcached_server_write_instance_st ptr);
 
@@ -77,7 +73,3 @@ memcached_server_write_instance_st memcached_io_get_readable_server(memcached_st
 
 LIBMEMCACHED_LOCAL
 memcached_return_t memcached_io_slurp(memcached_server_write_instance_st ptr);
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/libtest/memcached.cc b/libtest/memcached.cc
index 6f949297895f4d661cf83c2b8dfb2add316873d1..910ea809396dc2ad5476702cefe882cc5ecc5426 100644 (file)
--- a/libtest/memcached.cc
+++ b/libtest/memcached.cc
@@ -183,6 +183,7 @@ bool Memcached::build(int argc, const char *argv[])
   }
 
   arg_buffer << " -l 127.0.0.1 ";
+  arg_buffer << " -m 128 ";
   arg_buffer << " -M ";
 
   for (int x= 1 ; x < argc ; x++)