Fix for 32bit Debian

diff --git a/tests/libmemcached-1.0/pool.cc b/tests/libmemcached-1.0/pool.cc
index 9da4a0f953d235b736acdc026df232e5d0859eef..b6653139fda1bfb5afff89d0ebb346f2995aff88 100644 (file)
--- 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 6bb0a8712f6edddda244413d4c5a553ab2586e8d..e6f782f76227dd4721d2cd8c07745bf2b1f19371 100644 (file)
--- 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;