diff options
author | Viktor Söderqvist <viktor.soderqvist@est.tech> | 2023-03-12 15:31:32 +0100 |
---|---|---|
committer | Michael Grunder <michael.grunder@gmail.com> | 2023-03-13 12:08:58 -0700 |
commit | 04c1b5b0292da1c6515baf6cb5b5b9bb882f38d7 (patch) | |
tree | b8d8596762fb24b34024e0601c8953411908a21f | |
parent | 4ca8e73f66105585c167086db52ce66a6ea14afe (diff) |
Fix colliding option values
-rw-r--r-- | hiredis.h | 26 |
1 files changed, 10 insertions, 16 deletions
@@ -154,24 +154,18 @@ struct redisSsl; #define REDIS_OPT_NONBLOCK 0x01 #define REDIS_OPT_REUSEADDR 0x02 -#define REDIS_OPT_PREFER_IPV4 0x04 -#define REDIS_OPT_PREFER_IPV6 0x08 +#define REDIS_OPT_NOAUTOFREE 0x04 /* Don't automatically free the async + * object on a connection failure, or + * other implicit conditions. Only free + * on an explicit call to disconnect() + * or free() */ +#define REDIS_OPT_NO_PUSH_AUTOFREE 0x08 /* Don't automatically intercept and + * free RESP3 PUSH replies. */ +#define REDIS_OPT_NOAUTOFREEREPLIES 0x10 /* Don't automatically free replies. */ +#define REDIS_OPT_PREFER_IPV4 0x20 /* Prefer IPv4 in DNS lookups. */ +#define REDIS_OPT_PREFER_IPV6 0x40 /* Prefer IPv6 in DNS lookups. */ #define REDIS_OPT_PREFER_IP_UNSPEC (REDIS_OPT_PREFER_IPV4 | REDIS_OPT_PREFER_IPV6) -/** - * Don't automatically free the async object on a connection failure, - * or other implicit conditions. Only free on an explicit call to disconnect() or free() - */ -#define REDIS_OPT_NOAUTOFREE 0x04 - -/* Don't automatically intercept and free RESP3 PUSH replies. */ -#define REDIS_OPT_NO_PUSH_AUTOFREE 0x08 - -/** - * Don't automatically free replies - */ -#define REDIS_OPT_NOAUTOFREEREPLIES 0x10 - /* In Unix systems a file descriptor is a regular signed int, with -1 * representing an invalid descriptor. In Windows it is a SOCKET * (32- or 64-bit unsigned integer depending on the architecture), where |