From ddcf16030936d42bf9cac48c63e723b1bf1ba053 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Mon, 3 Feb 2014 16:33:28 +0100
Subject: [PATCH] Move mstime_t define outside sentinel.c.

The define is now used in other parts of Redis 2.8 tree instead of long
long.

A nice side effect is that now 2.8 and unstable sentinel.c files are
identical as it should be.
---
 src/redis.h    | 2 ++
 src/sentinel.c | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/redis.h b/src/redis.h
index f3643ff4..888d2254 100644
--- a/src/redis.h
+++ b/src/redis.h
@@ -368,6 +368,8 @@
  * Data types
  *----------------------------------------------------------------------------*/
 
+typedef long long mstime_t; /* millisecond time type. */
+
 /* A redis object, that is a type able to hold a string / list / set */
 
 /* The actual Redis Object */
diff --git a/src/sentinel.c b/src/sentinel.c
index fee3153f..d5d4d928 100644
--- a/src/sentinel.c
+++ b/src/sentinel.c
@@ -44,8 +44,6 @@ extern char **environ;
 
 /* ======================== Sentinel global state =========================== */
 
-typedef long long mstime_t; /* millisecond time type. */
-
 /* Address object, used to describe an ip:port pair. */
 typedef struct sentinelAddr {
     char *ip;