From 4369ee5d086967883ee91597540a599e543eacd6 Mon Sep 17 00:00:00 2001 From: Matt Stancliff Date: Wed, 9 Apr 2014 10:31:37 -0400 Subject: [PATCH] Fix build under Solaris Solaris doesn't define the TCP options we try to set. Let's ignore those under Solaris. Closes #207 --- net.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net.c b/net.c index 6cbae48..7c787df 100644 --- a/net.c +++ b/net.c @@ -130,13 +130,15 @@ int redisKeepAlive(redisContext *c, int interval) { return REDIS_ERR; } -#ifdef _OSX val = interval; + +#ifdef _OSX if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) { __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); return REDIS_ERR; } #else +#ifndef __sun val = interval; if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) { __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); @@ -155,6 +157,7 @@ int redisKeepAlive(redisContext *c, int interval) { __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); return REDIS_ERR; } +#endif #endif return REDIS_OK;