generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-24 09:12:28 +02:00
Code Issues Projects Releases Wiki Activity

regenerated sample project files, fixed a potential compile error in NetworkInterface when targetting older Windows releases

Browse Source
This commit is contained in:
Günter Obiltschnig
2014-10-16 14:16:40 +02:00
parent 1db210e8b9
commit a6fcc477bd
15 changed files with 259 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Net/src/NetworkInterface.cpp
View File

@@ -1203,8 +1203,8 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
// On Windows, a valid broadcast address will be all 1's (== address | ~subnetMask); additionaly, on pre-Vista versions of
// OS, master address structure does not contain member for prefix length; we go an extra mile here in order to make sure
// we reflect the actual values held by system and protect against misconfiguration (e.g. bad DHCP config entry)
#if defined(_WIN32_WCE)
ULONG prefixLength = 0;
#if defined(_WIN32_WCE)
#if _WIN32_WCE >= 0x0800
prefixLength = pUniAddr->OnLinkPrefixLength;
broadcastAddress = getBroadcastAddress(pAddress->FirstPrefix, address);
@@ -1222,7 +1222,6 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
broadcastAddress = host | ~mask;
}
#elif (_WIN32_WINNT >= 0x0501) && (NTDDI_VERSION >= 0x05010100) // Win XP SP1
ULONG prefixLength = 0;
#if (_WIN32_WINNT >= 0x0600) // Vista and newer
if (osvi.dwMajorVersion >= 6)
{