From: Brian Aker <brian@tangent.org>
Date: Sat, 20 Apr 2013 04:14:00 +0000 (-0700)
Subject: Fix Debian issues.
X-Git-Tag: 1.0.18~28^2~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=a6a4d4ef2daccea246d0c026c5e9060c33b38aec;p=awesomized%2Flibmemcached

Fix Debian issues.
---

diff --git a/libtest/framework.cc b/libtest/framework.cc
index 30f511af..92aacfee 100644
--- a/libtest/framework.cc
+++ b/libtest/framework.cc
@@ -68,7 +68,7 @@ Framework::Framework(libtest::SignalThread& signal_,
   get_world(this);
 }
 
-void Framework::collections(collection_st* collections_)
+void Framework::collections(collection_st collections_[])
 {
   for (collection_st *next= collections_; next and next->name; next++)
   {
diff --git a/libtest/framework.h b/libtest/framework.h
index 7a24466a..361779db 100644
--- a/libtest/framework.h
+++ b/libtest/framework.h
@@ -72,7 +72,7 @@ public:
     _destroy= arg;
   }
 
-  void collections(collection_st* arg);
+  void collections(collection_st arg[]);
 
   void set_on_error(test_callback_error_fn *arg)
   {
diff --git a/libtest/run.gdb b/libtest/run.gdb
index 328ee8f0..25dcdd53 100644
--- a/libtest/run.gdb
+++ b/libtest/run.gdb
@@ -1,6 +1,6 @@
 set logging on
 set logging overwrite on
 set environment LIBTEST_IN_GDB=1
-set ASAN_OPTIONS=abort_on_error=1
+#set ASAN_OPTIONS=abort_on_error=1
 run
 thread apply all bt
diff --git a/libtest/server_container.cc b/libtest/server_container.cc
index 3a5a7a0e..4e73a0e9 100644
--- a/libtest/server_container.cc
+++ b/libtest/server_container.cc
@@ -215,9 +215,9 @@ libtest::Server* server_startup_st::create(const std::string& server_type, in_po
   }
   else if (server_type.compare("drizzled") == 0)
   {
-    if (DRIZZLED_BINARY)
+    if (has_drizzled())
     {
-      if (HAVE_LIBDRIZZLE)
+      if (has_libdrizzle())
       {
         server= build_drizzled("localhost", try_port);
       }
@@ -225,8 +225,9 @@ libtest::Server* server_startup_st::create(const std::string& server_type, in_po
   }
   else if (server_type.compare("blobslap_worker") == 0)
   {
-    if (GEARMAND_BINARY)
+    if (has_gearmand())
     {
+#ifdef GEARMAND_BLOBSLAP_WORKER
       if (GEARMAND_BLOBSLAP_WORKER)
       {
         if (HAVE_LIBGEARMAN)
@@ -234,11 +235,12 @@ libtest::Server* server_startup_st::create(const std::string& server_type, in_po
           server= build_blobslap_worker(try_port);
         }
       }
+#endif // GEARMAND_BLOBSLAP_WORKER
     }
   }
   else if (server_type.compare("memcached") == 0)
   {
-    if (HAVE_MEMCACHED_BINARY)
+    if (has_memcached())
     {
       server= build_memcached("localhost", try_port);
     }
@@ -327,7 +329,7 @@ bool server_startup_st::_start_server(const bool is_socket,
       else
       {
         {
-#if defined(DEBUG)
+#ifdef DEBUG
           if (DEBUG)
           {
             Outn();
diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc
index eb74f00e..e50f5794 100644
--- a/tests/libmemcached-1.0/mem_functions.cc
+++ b/tests/libmemcached-1.0/mem_functions.cc
@@ -2838,7 +2838,7 @@ test_return_t ketama_TEST(memcached_st *)
 
   test_compare(memcached_behavior_set(&memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5), MEMCACHED_SUCCESS);
 
-  test_compare(memcached_behavior_get(&memc, MEMCACHED_BEHAVIOR_KETAMA_HASH), MEMCACHED_HASH_MD5);
+  test_compare(memcached_hash_t(memcached_behavior_get(&memc, MEMCACHED_BEHAVIOR_KETAMA_HASH)), MEMCACHED_HASH_MD5);
 
   test_compare(memcached_behavior_set_distribution(&memc, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY), MEMCACHED_SUCCESS);