From: Brian Aker <brian@tangent.org>
Date: Tue, 22 Feb 2011 21:58:11 +0000 (-0800)
Subject: Merge in trond.
X-Git-Tag: 0.51~31
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=831d9dafc253a93f28b5c8db2d37481a93b220e7;p=m6w6%2Flibmemcached

Merge in trond.
---

831d9dafc253a93f28b5c8db2d37481a93b220e7
diff --cc tests/hashkit_functions.c
index d1f846e7,53c94b59..deb5436a
--- a/tests/hashkit_functions.c
+++ b/tests/hashkit_functions.c
@@@ -248,10 -257,11 +257,12 @@@ static test_return_t hsieh_run (hashkit
    return TEST_SUCCESS;
  }
  
- static test_return_t murmur_run (hashkit_st *hashk __attribute__((unused)))
+ static test_return_t murmur_run (hashkit_st *hashk)
  {
+   (void)hashk;
+ 
  #ifdef WORDS_BIGENDIAN
 +  (void)murmur_values;
    return TEST_SKIPPED;
  #else
    uint32_t x;
diff --cc tests/mem_functions.c
index 357ea237,48b254db..b5bd0880
--- a/tests/mem_functions.c
+++ b/tests/mem_functions.c
@@@ -4835,20 -4859,7 +4863,20 @@@ static test_return_t hsieh_avaibility_t
    return TEST_SUCCESS;
  }
  
 +static test_return_t murmur_avaibility_test (memcached_st *memc)
 +{
 +  memcached_return_t expected_rc= MEMCACHED_FAILURE;
 +#ifdef HAVE_MURMUR_HASH
 +  expected_rc= MEMCACHED_SUCCESS;
 +#endif
 +  memcached_return_t rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH,
 +                                                (uint64_t)MEMCACHED_HASH_MURMUR);
 +  test_true(rc == expected_rc);
 +
 +  return TEST_SUCCESS;
 +}
 +
- static test_return_t one_at_a_time_run (memcached_st *memc __attribute__((unused)))
+ static test_return_t one_at_a_time_run (memcached_st *memc)
  {
    uint32_t x;
    const char **ptr;
@@@ -4977,10 -4995,9 +5012,10 @@@ static test_return_t hsieh_run (memcach
    return TEST_SUCCESS;
  }
  
- static test_return_t murmur_run (memcached_st *memc __attribute__((unused)))
+ static test_return_t murmur_run (memcached_st *memc)
  {
  #ifdef WORDS_BIGENDIAN
 +  (void)murmur_values;
    return TEST_SKIPPED;
  #else
    uint32_t x;