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

Add POCO_OS_ANDROID as platfrom definitons (#2186)

Browse Source 
* Add POCO_OS_ANDROID as platform definition

* Ignore test big ping when its failing
This commit is contained in:
Joerg-Christian Boehme
2018-02-27 02:18:45 +01:00
committed by Aleksandar Fabijanic
parent 9feabc7723
commit 73897b4357
21 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Net/src/NetworkInterface.cpp
View File

@@ -1511,14 +1511,14 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
} } // namespace Poco::Net
#elif POCO_OS == POCO_OS_LINUX
#elif POCO_OS == POCO_OS_LINUX || POCO_OS == POCO_OS_ANDROID
//
// Linux
//
#include <sys/types.h>
#ifndef POCO_ANDROID // Android doesn't have <ifaddrs.h>
#if POCO_OS != POCO_OS_ANDROID // Android doesn't have <ifaddrs.h>
#include <ifaddrs.h>
#endif
#include <net/if.h>
@@ -1553,7 +1553,7 @@ static NetworkInterface::Type fromNative(unsigned arphrd)
}
}
#ifndef POCO_ANDROID
#if POCO_OS != POCO_OS_ANDROID
void setInterfaceParams(struct ifaddrs* iface, NetworkInterfaceImpl& impl)
{
@@ -1609,7 +1609,7 @@ void setInterfaceParams(struct ifaddrs* iface, NetworkInterfaceImpl& impl)
NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
{
#ifndef POCO_ANDROID
#if POCO_OS != POCO_OS_ANDROID
FastMutex::ScopedLock lock(_mutex);
Map result;
unsigned ifIndex = 0;