From: Brian Aker <brian@tangent.org>
Date: Tue, 18 Sep 2012 01:48:17 +0000 (-0400)
Subject: Fix for 32bit Debian
X-Git-Tag: 1.0.12~23^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=5c94437d6b24d5582a41671a42f1f12ef3a1268e;p=m6w6%2Flibmemcached

Fix for 32bit Debian
---

diff --git a/tests/libmemcached-1.0/pool.cc b/tests/libmemcached-1.0/pool.cc
index 9da4a0f9..b6653139 100644
--- a/tests/libmemcached-1.0/pool.cc
+++ b/tests/libmemcached-1.0/pool.cc
@@ -240,7 +240,7 @@ struct test_pool_context_st {
   }
 };
 
-static void* connection_release(void *arg)
+static __attribute__((noreturn)) void* connection_release(void *arg)
 {
   test_pool_context_st *resource= static_cast<test_pool_context_st *>(arg);
   if (resource == NULL)
diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index 6bb0a871..e6f782f7 100644
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -49,7 +49,7 @@ static void *world_create(libtest::server_startup_st& servers, test_return_t& er
     return NULL;
   }
 
-  if (servers.sasl() and ((LIBMEMCACHED_WITH_SASL_SUPPORT == 0) or (MEMCACHED_SASL_BINARY == 0)))
+  if ((servers.sasl()) and ((LIBMEMCACHED_WITH_SASL_SUPPORT == 0) or (MEMCACHED_SASL_BINARY == 0)))
   {
     error= TEST_SKIPPED;
     return NULL;