summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2014-02-03 16:33:28 +0100
committerantirez <antirez@gmail.com>2014-02-03 16:34:46 +0100
commitddcf16030936d42bf9cac48c63e723b1bf1ba053 (patch)
tree4cf418dccb3214e477e4a911088f717ab8a86b01
parentc5bc59265043332b925ec1ffaa9498a31e5df7bb (diff)
downloadredis-ddcf16030936d42bf9cac48c63e723b1bf1ba053.tar.gz
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.
-rw-r--r--src/redis.h2
-rw-r--r--src/sentinel.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/redis.h b/src/redis.h
index f3643ff44..888d2254c 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 fee3153f1..d5d4d928e 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;