generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 19:10:20 +01: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

2
Net/include/Poco/Net/ICMPv4PacketImpl.h
View File

@@ -47,7 +47,7 @@ public:
};
// compile-time shield against misalignment
#ifndef POCO_ANDROID
#ifndef POCO_OS == POCO_OS_ANDROID
poco_static_assert (offsetof(Header, code) == 0x01);
poco_static_assert (offsetof(Header, checksum) == 0x02);
poco_static_assert (offsetof(Header, id) == 0x04);

2
Net/include/Poco/Net/Net.h
View File

@@ -114,7 +114,7 @@ POCO_NET_FORCE_SYMBOL(pocoNetworkInitializer)
//
// Define POCO_NET_HAS_INTERFACE for platforms that have network interface detection implemented.
//
#if defined(POCO_OS_FAMILY_WINDOWS) || (POCO_OS == POCO_OS_LINUX) || defined(POCO_OS_FAMILY_BSD) || (POCO_OS == POCO_OS_SOLARIS) || (POCO_OS == POCO_OS_QNX)
#if defined(POCO_OS_FAMILY_WINDOWS) || (POCO_OS == POCO_OS_LINUX) || POCO_OS == (POCO_OS_ANDROID) || defined(POCO_OS_FAMILY_BSD) || (POCO_OS == POCO_OS_SOLARIS) || (POCO_OS == POCO_OS_QNX)
#define POCO_NET_HAS_INTERFACE
#endif

2
Net/include/Poco/Net/SocketDefs.h
View File

@@ -143,7 +143,7 @@
#include <netinet/tcp.h>
#include <netdb.h>
#if defined(POCO_OS_FAMILY_UNIX)
#if (POCO_OS == POCO_OS_LINUX)
#if (POCO_OS == POCO_OS_LINUX) || (POCO_OS == POCO_OS_ANDROID)
// Net/src/NetworkInterface.cpp changed #include <linux/if.h> to #include <net/if.h>
// no more conflict, can use #include <net/if.h> here
#include <net/if.h>