Merge

[m6w6/libmemcached] / libhashkit / hsieh.c

diff --git a/libhashkit/hsieh.c b/libhashkit/hsieh.c
index cd44b67ff5c86993033664d2443e309cdc025779..46cc241e330125249466b225e96976e817d634ad 100644 (file)
--- a/libhashkit/hsieh.c
+++ b/libhashkit/hsieh.c
@@ -1,11 +1,11 @@
 /* By Paul Hsieh (C) 2004, 2005.  Covered under the Paul Hsieh
- * derivative license. 
+ * derivative license.
  * See: http://www.azillionmonkeys.com/qed/weblicense.html for license
  * details.
  * http://www.azillionmonkeys.com/qed/hash.html
 */
 
-#include "hash_common.h"
+#include "common.h"
 
 #undef get16bits
 #if (defined(__GNUC__) && defined(__i386__))
@@ -17,7 +17,7 @@
                       +(uint32_t)(((const uint8_t *)(d))[0]) )
 #endif
 
-uint32_t hashkit_hsieh(const char *key, size_t key_length)
+uint32_t hashkit_hsieh(const char *key, size_t key_length, void *context__attribute__((unused)))
 {
   uint32_t hash = 0, tmp;
   int rem;