Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r15930) -Fix (r15926): MSVC compilation

Browse Source
This commit is contained in:
glx 2009-04-03 12:48:11 +00:00
parent f9e9708ddc
commit 825aa87e80
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/core/host.cpp
View File

@ -79,7 +79,7 @@ static int NetworkFindBroadcastIPsInternal(NetworkAddress *broadcast, int limit)
if (ip != INADDR_LOOPBACK && ip != INADDR_ANY) { if (ip != INADDR_LOOPBACK && ip != INADDR_ANY) {
sockaddr_storage address; sockaddr_storage address;
memset(&address, 0, sizeof(address)); memset(&address, 0, sizeof(address));
((sockaddr_in*)&storage)->sin_addr.s_addr = htonl(ip | ~netmask); ((sockaddr_in*)&address)->sin_addr.s_addr = htonl(ip | ~netmask);
broadcast[index] = NetworkAddress(address, sizeof(sockaddr)); broadcast[index] = NetworkAddress(address, sizeof(sockaddr));
index++; index++;
} }
@ -137,7 +137,7 @@ static int NetworkFindBroadcastIPsInternal(NetworkAddress *broadcast, int limit)
sockaddr_storage address; sockaddr_storage address;
memset(&address, 0, sizeof(address)); memset(&address, 0, sizeof(address));
/* iiBroadcast is unusable, because it always seems to be set to 255.255.255.255. */ /* iiBroadcast is unusable, because it always seems to be set to 255.255.255.255. */
((sockaddr_in*)&storage)->sin_addr.s_addr = ifo[j].iiAddress.AddressIn.sin_addr.s_addr | ~ifo[j].iiNetmask.AddressIn.sin_addr.s_addr; ((sockaddr_in*)&address)->sin_addr.s_addr = ifo[j].iiAddress.AddressIn.sin_addr.s_addr | ~ifo[j].iiNetmask.AddressIn.sin_addr.s_addr;
broadcast[index] = NetworkAddress(address, sizeof(sockaddr)); broadcast[index] = NetworkAddress(address, sizeof(sockaddr));
} }

1
src/network/core/host.h
View File

@ -5,6 +5,7 @@
*/ */
#ifndef NETWORK_CORE_HOST_H #ifndef NETWORK_CORE_HOST_H
#define NETWORK_CORE_HOST_H
void NetworkFindBroadcastIPs(NetworkAddress *broadcast, int limit); void NetworkFindBroadcastIPs(NetworkAddress *broadcast, int limit);