Merge branch 'unstable' of github.com:/antirez/redis into unstable

3 files changed, 7 insertions, 1 deletions

diff --git a/src/acl.c b/src/acl.c
index b046785ff..efe6b96ad 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -1830,6 +1830,7 @@ void aclCommand(client *c) {
             case ACL_DENIED_CMD: reasonstr="command"; break;
             case ACL_DENIED_KEY: reasonstr="key"; break;
             case ACL_DENIED_AUTH: reasonstr="auth"; break;
+            default: reasonstr="unknown";
             }
             addReplyBulkCString(c,reasonstr);
 
diff --git a/src/redis-cli.c b/src/redis-cli.c
index 1d79e0db0..54898f42e 100644
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -7737,7 +7737,7 @@ static void LRUTestMode(void) {
          * to fill the target instance easily. */
         start_cycle = mstime();
         long long hits = 0, misses = 0;
-        while(mstime() - start_cycle < 1000) {
+        while(mstime() - start_cycle < LRU_CYCLE_PERIOD) {
             /* Write cycle. */
             for (j = 0; j < LRU_CYCLE_PIPELINE_SIZE; j++) {
                 char val[6];
diff --git a/src/sdsalloc.h b/src/sdsalloc.h
index 531d41929..c04ff2a0a 100644
--- a/src/sdsalloc.h
+++ b/src/sdsalloc.h
@@ -36,7 +36,12 @@
  * the include of your alternate allocator if needed (not needed in order
  * to use the default libc allocator). */
 
+#ifndef __SDS_ALLOC_H__
+#define __SDS_ALLOC_H__
+
 #include "zmalloc.h"
 #define s_malloc zmalloc
 #define s_realloc zrealloc
 #define s_free zfree
+
+#endif