Merge working tree with build tree.

[m6w6/libmemcached] / libhashkit / murmur.cc

diff --git a/libhashkit/murmur.cc b/libhashkit/murmur.cc
index a40b11b744d819fae62d6697b27caace7d1ff578..d30e850d6207b008f44896ce4646076a502b3f62 100644 (file)
--- a/libhashkit/murmur.cc
+++ b/libhashkit/murmur.cc
@@ -17,6 +17,8 @@
 
 #include <libhashkit/common.h>
 
+#ifdef HAVE_MURMUR_HASH
+
 uint32_t hashkit_murmur(const char *key, size_t length, void *context)
 {
   /*
@@ -75,3 +77,10 @@ uint32_t hashkit_murmur(const char *key, size_t length, void *context)
 
   return h;
 }
+
+#else
+uint32_t hashkit_murmur(const char *, size_t , void *)
+{
+  return 0;
+}
+#endif