Merge in bug fix for 677609

[m6w6/libmemcached] / libhashkit / algorithm.c

diff --git a/libhashkit/algorithm.c b/libhashkit/algorithm.c
index 380950e96dd81c736a330b1fd607cb634a4bc07b..0f0f9f01e3f4107e59233423aae010bc097e911e 100644 (file)
--- a/libhashkit/algorithm.c
+++ b/libhashkit/algorithm.c
@@ -45,10 +45,12 @@ uint32_t libhashkit_hsieh(const char *key, size_t key_length)
 }
 #endif
 
+#ifdef HAVE_MURMUR_HASH
 uint32_t libhashkit_murmur(const char *key, size_t key_length)
 {
   return hashkit_murmur(key, key_length, NULL);
 }
+#endif
 
 uint32_t libhashkit_jenkins(const char *key, size_t key_length)
 {
@@ -60,8 +62,8 @@ uint32_t libhashkit_md5(const char *key, size_t key_length)
   return hashkit_md5(key, key_length, NULL);
 }
 
-void libhashkit_md5_signature(const unsigned char *key, uint32_t length, unsigned char *result)
+void libhashkit_md5_signature(const unsigned char *key, size_t length, unsigned char *result)
 {
-  md5_signature(key, length, result);
+  md5_signature(key, (uint32_t)length, result);
 }