projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
ICC fix
[m6w6/libmemcached]
/
libmemcached
/
constants.h
diff --git
a/libmemcached/constants.h
b/libmemcached/constants.h
index cbdbf4b58467c82b89c6c2ffd6b21688b35bbf48..980a32bfec1657ce153b3215214a670cea89bce3 100644
(file)
--- a/
libmemcached/constants.h
+++ b/
libmemcached/constants.h
@@
-76,7
+76,8
@@
typedef enum {
MEMCACHED_DISTRIBUTION_CONSISTENT,
MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA,
MEMCACHED_DISTRIBUTION_RANDOM,
MEMCACHED_DISTRIBUTION_CONSISTENT,
MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA,
MEMCACHED_DISTRIBUTION_RANDOM,
- MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY
+ MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY,
+ MEMCACHED_DISTRIBUTION_CONSISTENT_MAX
} memcached_server_distribution_t;
typedef enum {
} memcached_server_distribution_t;
typedef enum {
@@
-110,13
+111,10
@@
typedef enum {
MEMCACHED_BEHAVIOR_USE_UDP,
MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS,
MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS,
MEMCACHED_BEHAVIOR_USE_UDP,
MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS,
MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS,
- MEMCACHED_BEHAVIOR_
KETAMA_COMPAT_MODE
,
- MEMCACHED_BEHAVIOR_
RANDOMIZE_REPLICA_READ
+ MEMCACHED_BEHAVIOR_
RANDOMIZE_REPLICA_READ
,
+ MEMCACHED_BEHAVIOR_
MAX
} memcached_behavior_t;
} memcached_behavior_t;
-#define MEMCACHED_KETAMA_COMPAT_LIBMEMCACHED 0
-#define MEMCACHED_KETAMA_COMPAT_SPY 1
-
typedef enum {
MEMCACHED_CALLBACK_PREFIX_KEY = 0,
MEMCACHED_CALLBACK_USER_DATA = 1,
typedef enum {
MEMCACHED_CALLBACK_PREFIX_KEY = 0,
MEMCACHED_CALLBACK_USER_DATA = 1,
@@
-128,7
+126,8
@@
typedef enum {
MEMCACHED_CALLBACK_FREE_FUNCTION = 6,
#endif
MEMCACHED_CALLBACK_GET_FAILURE = 7,
MEMCACHED_CALLBACK_FREE_FUNCTION = 6,
#endif
MEMCACHED_CALLBACK_GET_FAILURE = 7,
- MEMCACHED_CALLBACK_DELETE_TRIGGER = 8
+ MEMCACHED_CALLBACK_DELETE_TRIGGER = 8,
+ MEMCACHED_CALLBACK_MAX
} memcached_callback_t;
typedef enum {
} memcached_callback_t;
typedef enum {
@@
-141,14
+140,16
@@
typedef enum {
MEMCACHED_HASH_FNV1A_32,
MEMCACHED_HASH_HSIEH,
MEMCACHED_HASH_MURMUR,
MEMCACHED_HASH_FNV1A_32,
MEMCACHED_HASH_HSIEH,
MEMCACHED_HASH_MURMUR,
- MEMCACHED_HASH_JENKINS
+ MEMCACHED_HASH_JENKINS,
+ MEMCACHED_HASH_MAX
} memcached_hash_t;
typedef enum {
MEMCACHED_CONNECTION_UNKNOWN,
MEMCACHED_CONNECTION_TCP,
MEMCACHED_CONNECTION_UDP,
} memcached_hash_t;
typedef enum {
MEMCACHED_CONNECTION_UNKNOWN,
MEMCACHED_CONNECTION_TCP,
MEMCACHED_CONNECTION_UDP,
- MEMCACHED_CONNECTION_UNIX_SOCKET
+ MEMCACHED_CONNECTION_UNIX_SOCKET,
+ MEMCACHED_CONNECTION_MAX
} memcached_connection_t;
#endif /* __MEMCACHED_CONSTANTS_H__ */
} memcached_connection_t;
#endif /* __MEMCACHED_CONSTANTS_H__ */