mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix windows build

This commit is contained in:
Ted John 2019-05-06 12:51:01 +01:00
parent 47f48721e8
commit 52afcb795f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2-ui/windows/ServerList.cpp
View File

@ -557,7 +557,7 @@ static void server_list_fetch_servers_begin()
auto entries = lanF.get();
allEntries.insert(allEntries.end(), entries.begin(), entries.end());
}
catch (const std::exception& e)
catch (...)
{
}
@ -571,7 +571,7 @@ static void server_list_fetch_servers_begin()
{
status = e.StatusText;
}
catch (const std::exception& e)
catch (...)
{
status = STR_SERVER_LIST_NO_CONNECTION;
}

8
src/openrct2/network/Socket.cpp
View File

@ -819,7 +819,7 @@ std::unique_ptr<IUdpSocket> CreateUdpSocket()
}
# ifdef _WIN32
std::vector<INTERFACE_INFO> GetNetworkInterfaces()
static std::vector<INTERFACE_INFO> GetNetworkInterfaces()
{
int sock = socket(AF_INET, SOCK_DGRAM, 0);
if (sock == -1)
@ -834,8 +834,8 @@ std::vector<INTERFACE_INFO> GetNetworkInterfaces()
{
interfaces.resize(capacity);
if (WSAIoctl(
sock, SIO_GET_INTERFACE_LIST, nullptr, 0, interfaces.data(), capacity * sizeof(INTERFACE_INFO), &len, nullptr,
nullptr)
sock, SIO_GET_INTERFACE_LIST, nullptr, 0, interfaces.data(), (DWORD)(capacity * sizeof(INTERFACE_INFO)), &len,
nullptr, nullptr)
== 0)
{
break;
@ -870,7 +870,7 @@ std::vector<std::unique_ptr<INetworkEndpoint>> GetBroadcastAddresses()
memcpy(&address, &ifo.iiAddress.Address, sizeof(sockaddr));
((sockaddr_in*)&address)->sin_addr.s_addr = ifo.iiAddress.AddressIn.sin_addr.s_addr
| ~ifo.iiNetmask.AddressIn.sin_addr.s_addr;
baddresses.push_back(std::make_unique<NetworkEndpoint>(address, sizeof(sockaddr)));
baddresses.push_back(std::make_unique<NetworkEndpoint>((const sockaddr*)&address, (socklen_t)sizeof(sockaddr)));
}
# else
int sock = socket(AF_INET, SOCK_DGRAM, 0);