Minor code code cleanup, plus modification to while() loop around poll in

[m6w6/libmemcached] / libmemcached / constants.h

diff --git a/libmemcached/constants.h b/libmemcached/constants.h
index 11b2f677e2702c2e984d7778f38f676c308ba094..f05b03ebb0316fe0dce49002ce284fc87bb409a8 100644 (file)
--- a/libmemcached/constants.h
+++ b/libmemcached/constants.h
@@ -9,14 +9,13 @@
  *
  */
 
-#ifndef __MEMCACHED_CONSTANTS_H__
-#define __MEMCACHED_CONSTANTS_H__
+#ifndef __LIBMEMCACHED_CONSTANTS_H__
+#define __LIBMEMCACHED_CONSTANTS_H__
 
 /* Public defines */
 #define MEMCACHED_DEFAULT_PORT 11211
 #define MEMCACHED_MAX_KEY 251 /* We add one to have it null terminated */
 #define MEMCACHED_MAX_BUFFER 8196
-#define MEMCACHED_MAX_HOST_LENGTH 64
 #define MEMCACHED_MAX_HOST_SORT_LENGTH 86 /* Used for Ketama */
 #define MEMCACHED_POINTS_PER_SERVER 100
 #define MEMCACHED_POINTS_PER_SERVER_KETAMA 160
@@ -69,6 +68,7 @@ typedef enum {
   MEMCACHED_UNKNOWN_STAT_KEY,
   MEMCACHED_E2BIG,
   MEMCACHED_INVALID_ARGUMENTS,
+  MEMCACHED_KEY_TOO_BIG,
   MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */
 } memcached_return_t;
 
@@ -144,6 +144,7 @@ typedef enum {
   MEMCACHED_HASH_HSIEH,
   MEMCACHED_HASH_MURMUR,
   MEMCACHED_HASH_JENKINS,
+  MEMCACHED_HASH_CUSTOM,
   MEMCACHED_HASH_MAX
 } memcached_hash_t;
 
@@ -155,4 +156,4 @@ typedef enum {
   MEMCACHED_CONNECTION_MAX
 } memcached_connection_t;
 
-#endif /* __MEMCACHED_CONSTANTS_H__ */
+#endif /* __LIBMEMCACHED_CONSTANTS_H__ */