From 7bac7d37cb20004a6dc990b4af229d9a424e89f0 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Mon, 7 Sep 2015 17:29:13 +0200
Subject: [PATCH] Fix merge issues in 490847c.

---
 src/rdb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rdb.c b/src/rdb.c
index 97d55d5b..27b2c610 100644
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -1510,12 +1510,12 @@ int rdbSaveToSlavesSockets(void) {
              * replicationSetupSlaveForFullResync() turned it into BGSAVE_END */
             listRewind(server.slaves,&li);
             while((ln = listNext(&li))) {
-                client *slave = ln->value;
+                redisClient *slave = ln->value;
                 int j;
 
                 for (j = 0; j < numfds; j++) {
                     if (slave->id == clientids[j]) {
-                        slave->replstate = SLAVE_STATE_WAIT_BGSAVE_START;
+                        slave->replstate = REDIS_REPL_WAIT_BGSAVE_START;
                         break;
                     }
                 }