Merge trunk for LP

[m6w6/libmemcached] / tests / virtual_buckets.cc

diff --git a/tests/virtual_buckets.cc b/tests/virtual_buckets.cc
index 60837d11d4ca34168513e512ba32ef618adf0b8f..9ae7d6f1c21d96d52bdf6a51e294ecf5323f8bc1 100644 (file)
--- a/tests/virtual_buckets.cc
+++ b/tests/virtual_buckets.cc
@@ -35,12 +35,14 @@
  *
  */
 
-#include <config.h>
+#include <libtest/common.h>
 
 #include <tests/virtual_buckets.h>
 
 #include <libmemcached/memcached.h>
 
+#include <cstring>
+
 struct libtest_string_t {
   const char *c_str;
   size_t size;
@@ -56,7 +58,7 @@ static inline libtest_string_t libtest_string(const char *arg, size_t arg_size)
 
 static libtest_string_t libtest_string_t_null= { 0, 0};
 
-bool libtest_string_is_null(const libtest_string_t &string)
+static bool libtest_string_is_null(const libtest_string_t &string)
 {
   if (string.c_str == 0 and string.size == 0)
     return true;