Merge in all current libmemcached work, plus restore older, working,

[m6w6/libmemcached] / libhashkit / common.h

diff --git a/libhashkit/common.h b/libhashkit/common.h
index 0a7ac845eac15291e1636f94cb3cba51884af969..73b198f589aa05c5ce640c9e5b6377b00125e206 100644 (file)
--- a/libhashkit/common.h
+++ b/libhashkit/common.h
@@ -6,15 +6,10 @@
  * the COPYING file in the parent directory for full text.
  */
 
-/**
- * @file
- * @brief System Include Files
- */
-
 #ifndef HASHKIT_COMMON_H
 #define HASHKIT_COMMON_H
 
-#include "config.h"
+#include <config.h>
 
 #include <assert.h>
 #include <errno.h>
@@ -22,7 +17,11 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "hashkit.h"
+#include <libhashkit/hashkit.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 HASHKIT_LOCAL
 void md5_signature(const unsigned char *key, unsigned int length, unsigned char *result);
@@ -30,4 +29,8 @@ void md5_signature(const unsigned char *key, unsigned int length, unsigned char
 HASHKIT_LOCAL
 int update_continuum(hashkit_st *hashkit);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* HASHKIT_COMMON_H */