X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_constants.h;h=fb8305f46b2583c1dab8551babfe567ebb1013e3;hb=c4b0fc53b348067c6a6e5eaf335869393cf347bf;hp=fd2f2b4d8f45032967ddd34a1f0b22878479a40a;hpb=073c4085895027aabe10aec9264dd8f4dae7e264;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached_constants.h b/libmemcached/memcached_constants.h
index fd2f2b4d..fb8305f4 100644
--- a/libmemcached/memcached_constants.h
+++ b/libmemcached/memcached_constants.h
@@ -60,13 +60,13 @@ typedef enum {
   MEMCACHED_TIMEOUT,
   MEMCACHED_BUFFERED,
   MEMCACHED_BAD_KEY_PROVIDED,
-  MEMCACHED_MAXIMUM_RETURN, /* Always add new error code before */
+  MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */
 } memcached_return;
 
 typedef enum {
   MEMCACHED_DISTRIBUTION_MODULA,
   MEMCACHED_DISTRIBUTION_CONSISTENT,
-  MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA,
+  MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA
 } memcached_server_distribution;
 
 typedef enum {
@@ -86,6 +86,14 @@ typedef enum {
   MEMCACHED_BEHAVIOR_VERIFY_KEY,
   MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT,
   MEMCACHED_BEHAVIOR_RETRY_TIMEOUT,
+  MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED,
+  MEMCACHED_BEHAVIOR_KETAMA_HASH,
+  MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
+  MEMCACHED_BEHAVIOR_SND_TIMEOUT,
+  MEMCACHED_BEHAVIOR_RCV_TIMEOUT,
+  MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT,
+  MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK,
+  MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK
 } memcached_behavior;
 
 typedef enum {
@@ -97,7 +105,7 @@ typedef enum {
   MEMCACHED_CALLBACK_REALLOC_FUNCTION,
   MEMCACHED_CALLBACK_FREE_FUNCTION,
   MEMCACHED_CALLBACK_GET_FAILURE,
-  MEMCACHED_CALLBACK_DELETE_TRIGGER,
+  MEMCACHED_CALLBACK_DELETE_TRIGGER
 } memcached_callback;
 
 typedef enum {
@@ -110,19 +118,20 @@ typedef enum {
   MEMCACHED_HASH_FNV1A_32,
   MEMCACHED_HASH_HSIEH,
   MEMCACHED_HASH_MURMUR,
+  MEMCACHED_HASH_JENKINS
 } memcached_hash;
 
 typedef enum {
   MEMCACHED_CONNECTION_UNKNOWN,
   MEMCACHED_CONNECTION_TCP,
   MEMCACHED_CONNECTION_UDP,
-  MEMCACHED_CONNECTION_UNIX_SOCKET,
+  MEMCACHED_CONNECTION_UNIX_SOCKET
 } memcached_connection;
 
 typedef enum {
   MEMCACHED_NOT_ALLOCATED,
   MEMCACHED_ALLOCATED,
-  MEMCACHED_USED,
+  MEMCACHED_USED
 } memcached_allocated;