Merge branch 'master' into foldermove2

2013-11-26 17:15:39 +00:00
parent 770ef8c60b 2d68969a45
commit 139bd34690
7 changed files with 144 additions and 37 deletions
--- a/src/OSSupport/Socket.cpp
+++ b/src/OSSupport/Socket.cpp
@@ -210,9 +210,6 @@ bool cSocket::BindToAnyIPv4(unsigned short a_Port)

 bool cSocket::BindToAnyIPv6(unsigned short a_Port)
 {
-	// Cannot use socckaddr_in6, because it is not defined in the default VS2008 SDK
-	// Must jump through hoops here
-	
 	sockaddr_in6 local;
 	memset(&local, 0, sizeof(local));