From: Salvatore Sanfilippo <antirez@gmail.com>
Date: Thu, 5 Apr 2012 08:54:09 +0000 (-0700)
Subject: Merge pull request #426 from anydot/fix-rm-vm-comments
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/d84f776e873ea93f22dc230e2b10ee70a8a6cd2e?hp=-c

Merge pull request #426 from anydot/fix-rm-vm-comments

remove mentions of VM in comments
---

d84f776e873ea93f22dc230e2b10ee70a8a6cd2e
diff --combined src/redis.h
index a3a96f39,7502aa11..b386f16c
--- a/src/redis.h
+++ b/src/redis.h
@@@ -89,7 -89,6 +89,6 @@@
  #define REDIS_SET 2
  #define REDIS_ZSET 3
  #define REDIS_HASH 4
- #define REDIS_VMPOINTER 8
  
  /* Objects encoding. Some kind of objects like Strings and Hashes can be
   * internally represented in multiple ways. The 'encoding' field of the object
@@@ -828,7 -827,6 +827,7 @@@ extern dictType hashDictType
  long long ustime(void);
  long long mstime(void);
  void getRandomHexChars(char *p, unsigned int len);
 +uint64_t crc64(const unsigned char *s, uint64_t l);
  
  /* networking.c -- Networking and Client related operations */
  redisClient *createClient(int fd);