redis-check-dump now understands dumps produced by Redis 2.6

[redis.git] / deps / hiredis / net.h

diff --git a/deps/hiredis/net.h b/deps/hiredis/net.h
index 0e560008d5e846de0a3d1b334653bad7d2bcfbc5..eb8a0a1cfbb9c54b754ac1fd5c4b26b81a047b24 100644 (file)
--- a/deps/hiredis/net.h
+++ b/deps/hiredis/net.h
@@ -1,6 +1,8 @@
 /* Extracted from anet.c to work properly with Hiredis error reporting.
  *
 /* Extracted from anet.c to work properly with Hiredis error reporting.
  *

- * Copyright (c) 2006-2010, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2006-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+ * Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+ *

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without


@@ -31,7 +33,15 @@
 #ifndef __NET_H
 #define __NET_H
 
 #ifndef __NET_H
 #define __NET_H
 

-int redisContextConnectTcp(redisContext *c, const char *addr, int port);
-int redisContextConnectUnix(redisContext *c, const char *path);
+#include "hiredis.h"
+
+#if defined(__sun)
+#define AF_LOCAL AF_UNIX
+#endif
+
+int redisCheckSocketError(redisContext *c, int fd);
+int redisContextSetTimeout(redisContext *c, struct timeval tv);
+int redisContextConnectTcp(redisContext *c, const char *addr, int port, struct timeval *timeout);
+int redisContextConnectUnix(redisContext *c, const char *path, struct timeval *timeout);

 
 #endif
 
 #endif