Merge trunk.

[awesomized/libmemcached] / libhashkit / algorithm.h

diff --git a/libhashkit/algorithm.h b/libhashkit/algorithm.h
index 9e005eaf28b908ca1071bccf412584416ceda3ec..58b40bc3cbeef2344b85b0dcfc910adf68d549f1 100644 (file)
--- a/libhashkit/algorithm.h
+++ b/libhashkit/algorithm.h
@@ -11,8 +11,7 @@
  * @brief HashKit Header
  */
 
-#ifndef HASHKIT_ALGORITHM_H
-#define HASHKIT_ALGORITHM_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,8 +40,10 @@ HASHKIT_API
 uint32_t libhashkit_hsieh(const char *key, size_t key_length);
 #endif
 
+#ifdef HAVE_MURMUR_HASH
 HASHKIT_API
 uint32_t libhashkit_murmur(const char *key, size_t key_length);
+#endif
 
 HASHKIT_API
 uint32_t libhashkit_jenkins(const char *key, size_t key_length);
@@ -73,8 +74,10 @@ HASHKIT_LOCAL
 uint32_t hashkit_hsieh(const char *key, size_t key_length, void *context);
 #endif
 
+#ifdef HAVE_MURMUR_HASH
 HASHKIT_LOCAL
 uint32_t hashkit_murmur(const char *key, size_t key_length, void *context);
+#endif
 
 HASHKIT_LOCAL
 uint32_t hashkit_jenkins(const char *key, size_t key_length, void *context);
@@ -83,10 +86,8 @@ HASHKIT_LOCAL
 uint32_t hashkit_md5(const char *key, size_t key_length, void *context);
 
 HASHKIT_API
-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);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* HASHKIT_ALGORITHM_H */