Merge in libtest.

[m6w6/libmemcached] / libtest / memcached.cc

diff --git a/libtest/memcached.cc b/libtest/memcached.cc
index d17e5f51a12955d5bdb0d75bc480edbda6791f69..adf650f8c770df28b23dc73612af957f31437c70 100644 (file)
--- a/libtest/memcached.cc
+++ b/libtest/memcached.cc
@@ -375,8 +375,10 @@ bool Memcached::build(size_t argc, const char *argv[])
   }
 
   add_option("-l", "localhost");
+#ifndef TARGET_OS_OSX
   add_option("-m", "128");
   add_option("-M");
+#endif
 
   if (sasl())
   {