diff options
author | Florent Le Coz <louiz@louiz.org> | 2014-07-15 15:56:37 +0200 |
---|---|---|
committer | Florent Le Coz <louiz@louiz.org> | 2014-07-15 15:56:37 +0200 |
commit | 609722b4e742de10edd0d035c6927862ad5f160f (patch) | |
tree | e920833a1b38dcb2099caf2939f0cde962fcd819 /src/network/tcp_socket_handler.hpp | |
parent | b94247813bfdcb95b2b3cde9a7d27f90254f2a2f (diff) | |
parent | 6a4e17cb0a2d48695af2af488068f98515d714a1 (diff) | |
download | biboumi-609722b4e742de10edd0d035c6927862ad5f160f.tar.gz biboumi-609722b4e742de10edd0d035c6927862ad5f160f.tar.bz2 biboumi-609722b4e742de10edd0d035c6927862ad5f160f.tar.xz biboumi-609722b4e742de10edd0d035c6927862ad5f160f.zip |
Merge branch 'v1'
Conflicts:
src/network/socket_handler.hpp
Diffstat (limited to 'src/network/tcp_socket_handler.hpp')
-rw-r--r-- | src/network/tcp_socket_handler.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/tcp_socket_handler.hpp b/src/network/tcp_socket_handler.hpp index 876cd57..c25ad83 100644 --- a/src/network/tcp_socket_handler.hpp +++ b/src/network/tcp_socket_handler.hpp @@ -189,7 +189,7 @@ private: * again. */ struct addrinfo addrinfo; - struct sockaddr ai_addr; + struct sockaddr_in6 ai_addr; socklen_t ai_addrlen; protected: |