fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-29 17:01:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.2' into 2.2-zset

Browse Source 
Conflicts:
	src/object.c
This commit is contained in:
Pieter Noordhuis
2011-04-06 15:46:33 +02:00
parent 724376a0df 2b886275e9
commit dfeb899b2d
7 changed files with 136 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/redis.h
View File

@ -81,6 +81,7 @@
#define REDIS_ENCODING_LINKEDLIST 4 /* Encoded as regular linked list */
#define REDIS_ENCODING_ZIPLIST 5 /* Encoded as ziplist */
#define REDIS_ENCODING_INTSET 6 /* Encoded as intset */
#define REDIS_ENCODING_SKIPLIST 7 /* Encoded as skiplist */
/* Object types only used for dumping to disk */
#define REDIS_EXPIRETIME 253
@ -1021,6 +1022,7 @@ void punsubscribeCommand(redisClient *c);
void publishCommand(redisClient *c);
void watchCommand(redisClient *c);
void unwatchCommand(redisClient *c);
void objectCommand(redisClient *c);
#if defined(__GNUC__)
void *calloc(size_t count, size_t size) __attribute__ ((deprecated));