flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Added base Code::Blocks project (WIP, still doesn't compile) and fixed some source errors with MinGW.

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1510 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2013-05-25 14:59:41 +00:00
parent 41db106a8f
commit 67154217a2
14 changed files with 1711 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
source/OSSupport/Socket.cpp
View File

@@ -294,17 +294,32 @@ cSocket cSocket::AcceptIPv6(void)
if (SClient.IsValid())
{
#if defined(_WIN32)
// Windows XP doesn't have inet_ntop, so we need to improvise:
Printf(SClient.m_IPString, "%x:%x:%x:%x:%x:%x:%x:%x",
from.sin6_addr.u.Word[0],
from.sin6_addr.u.Word[1],
from.sin6_addr.u.Word[2],
from.sin6_addr.u.Word[3],
from.sin6_addr.u.Word[4],
from.sin6_addr.u.Word[5],
from.sin6_addr.u.Word[6],
from.sin6_addr.u.Word[7]
);
// Windows XP doesn't have inet_ntop, so we need to improvise. And MSVC has different headers than GCC
#ifdef _MSC_VER
// MSVC version
Printf(SClient.m_IPString, "%x:%x:%x:%x:%x:%x:%x:%x",
from.sin6_addr.u.Word[0],
from.sin6_addr.u.Word[1],
from.sin6_addr.u.Word[2],
from.sin6_addr.u.Word[3],
from.sin6_addr.u.Word[4],
from.sin6_addr.u.Word[5],
from.sin6_addr.u.Word[6],
from.sin6_addr.u.Word[7]
);
#else // _MSC_VER
// MinGW
Printf(SClient.m_IPString, "%x:%x:%x:%x:%x:%x:%x:%x",
from.sin6_addr.s6_addr16[0],
from.sin6_addr.s6_addr16[1],
from.sin6_addr.s6_addr16[2],
from.sin6_addr.s6_addr16[3],
from.sin6_addr.s6_addr16[4],
from.sin6_addr.s6_addr16[5],
from.sin6_addr.s6_addr16[6],
from.sin6_addr.s6_addr16[7]
);
#endif // else _MSC_VER
#else
char buffer[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, &(from.sin6_addr), buffer, sizeof(buffer));