mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v1'

Browse Source 
Conflicts:
	src/network/socket_handler.hpp
This commit is contained in:
Florent Le Coz
2014-07-15 15:56:37 +02:00
parent b94247813b 6a4e17cb0a
commit 609722b4e7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/tcp_socket_handler.hpp
+1 -1
View File
@@ -189,7 +189,7 @@ private:
* again.
*/
struct addrinfo addrinfo;
struct sockaddr ai_addr;
struct sockaddr_in6 ai_addr;
socklen_t ai_addrlen;
protected: