Commit 1133297a authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

merge

parents 867ce618 57c2ea18
IF(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD") IF(WIN32)
# Handlersocket does not compile on Windows, compiles but does # Handlersocket does not compile on Windows, compiles but does
# not start on FreeBSD. # not start on FreeBSD.
RETURN() RETURN()
......
...@@ -35,7 +35,7 @@ struct auto_addrinfo : private noncopyable { ...@@ -35,7 +35,7 @@ struct auto_addrinfo : private noncopyable {
int resolve(const char *node, const char *service, int flags = 0, int resolve(const char *node, const char *service, int flags = 0,
int family = AF_UNSPEC, int socktype = SOCK_STREAM, int protocol = 0) { int family = AF_UNSPEC, int socktype = SOCK_STREAM, int protocol = 0) {
reset(); reset();
addrinfo hints; addrinfo hints = { };
hints.ai_flags = flags; hints.ai_flags = flags;
hints.ai_family = family; hints.ai_family = family;
hints.ai_socktype = socktype; hints.ai_socktype = socktype;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment