summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Brewer <jzb0012@auburn.edu>2018-04-12 15:22:51 -0500
committerJustin Brewer <jzb0012@auburn.edu>2018-04-28 16:35:38 -0500
commitbbeab80090556ef115b6e11c9bbab534b9ea7717 (patch)
treee439cfc7a700b3f13f6356710f6aee6de89750a1
parent3d8709d19d7fa67d203a33c969e69f0f1a4eab02 (diff)
Use AF_UNIX
AF_LOCAL is the old, non-standardized name for AF_UNIX. Just use AF_UNIX, rather than wrestling with platform specifics of AF_LOCAL definitions. Signed-off-by: Justin Brewer <jzb0012@auburn.edu>
-rw-r--r--net.c4
-rw-r--r--net.h4
2 files changed, 2 insertions, 6 deletions
diff --git a/net.c b/net.c
index 33d9a82..99f647d 100644
--- a/net.c
+++ b/net.c
@@ -432,7 +432,7 @@ int redisContextConnectUnix(redisContext *c, const char *path, const struct time
struct sockaddr_un sa;
long timeout_msec = -1;
- if (redisCreateSocket(c,AF_LOCAL) < 0)
+ if (redisCreateSocket(c,AF_UNIX) < 0)
return REDIS_ERR;
if (redisSetBlocking(c,0) != REDIS_OK)
return REDIS_ERR;
@@ -457,7 +457,7 @@ int redisContextConnectUnix(redisContext *c, const char *path, const struct time
if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
return REDIS_ERR;
- sa.sun_family = AF_LOCAL;
+ sa.sun_family = AF_UNIX;
strncpy(sa.sun_path,path,sizeof(sa.sun_path)-1);
if (connect(c->fd, (struct sockaddr*)&sa, sizeof(sa)) == -1) {
if (errno == EINPROGRESS && !blocking) {
diff --git a/net.h b/net.h
index fc8ddd3..d9dc362 100644
--- a/net.h
+++ b/net.h
@@ -37,10 +37,6 @@
#include "hiredis.h"
-#if defined(__sun) || defined(AIX)
-#define AF_LOCAL AF_UNIX
-#endif
-
int redisCheckSocketError(redisContext *c);
int redisContextSetTimeout(redisContext *c, const struct timeval tv);
int redisContextConnectTcp(redisContext *c, const char *addr, int port, const struct timeval *timeout);