From 191f8532ea251eabbcb56bc71bee2184a3ad971f Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Fri, 29 Jul 2011 20:06:12 -0700
Subject: [PATCH] Merge in updates to io

---
 libmemcached/io.h    | 7 +++++++
 libmemcached/io.hpp  | 8 --------
 libtest/memcached.cc | 1 +
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libmemcached/io.h b/libmemcached/io.h
index 0a05b92a..3591de92 100644
--- 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 7413ac4b..23a4a6b4 100644
--- 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 6f949297..910ea809 100644
--- 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++)
-- 
2.30.2