- Android compile fixes

RangelReale · RangelReale · commit 8101b850dc73 · 2012-11-11T16:49:07.000-02:00
diff --git a/Net/include/Poco/Net/ICMPv4PacketImpl.h b/Net/include/Poco/Net/ICMPv4PacketImpl.h
@@ -69,10 +69,12 @@ class Net_API ICMPv4PacketImpl : public ICMPPacketImpl
 	};
 
 	// compile-time shield against misalignment
+#ifndef POCO_ANDROID	
 	poco_static_assert (offsetof(Header, code) == 0x01);
 	poco_static_assert (offsetof(Header, checksum) == 0x02);
 	poco_static_assert (offsetof(Header, id) == 0x04);
 	poco_static_assert (offsetof(Header, seq) == 0x06);
+#endif
 
 	enum MessageType
 	{
diff --git a/Net/include/Poco/Net/SocketDefs.h b/Net/include/Poco/Net/SocketDefs.h
@@ -39,6 +39,16 @@
 #ifndef Net_SocketDefs_INCLUDED
 #define Net_SocketDefs_INCLUDED
 
+#ifndef __THROW
+# ifndef __GNUC_PREREQ
+#  define __GNUC_PREREQ(maj, min) (0)
+# endif
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+#  define __THROW	throw ()
+# else
+#  define __THROW
+# endif
+#endif
 
 #if defined(POCO_OS_FAMILY_WINDOWS)
 	#include "Poco/UnWindows.h"
diff --git a/Net/src/NetworkInterface.cpp b/Net/src/NetworkInterface.cpp
@@ -1276,7 +1276,9 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
 
 
 #include <sys/types.h>
+#ifndef POCO_ANDROID // Android doesn't have <ifaddrs.h>
 #include <ifaddrs.h>
+#endif
 #include <linux/if.h>
 #include <linux/if_packet.h>
 #include <net/if_arp.h>
@@ -1306,6 +1308,8 @@ static NetworkInterface::Type fromNative(unsigned arphrd)
 	}
 }
 
+#ifndef POCO_ANDROID
+
 void setInterfaceParams(struct ifaddrs* iface, NetworkInterfaceImpl& impl)
 {
 	struct sockaddr_ll* sdl = (struct sockaddr_ll*) iface->ifa_addr;
@@ -1317,11 +1321,14 @@ void setInterfaceParams(struct ifaddrs* iface, NetworkInterfaceImpl& impl)
 	impl.setType(fromNative(sdl->sll_hatype));
 }
 
+#endif
+
 }
 
 
 NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
 {
+#ifndef POCO_ANDROID
 	FastMutex::ScopedLock lock(_mutex);
 	Map result;
 	unsigned ifIndex = 0;
@@ -1420,6 +1427,9 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)
 	if (ifaces) freeifaddrs(ifaces);
 
 	return result;
+#else
+	throw Poco::NotImplementedException("Not implemented in Android");
+#endif
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1276,7 +1276,9 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)`
`1276`	`1276`
`1277`	`1277`
`1278`	`1278`	`#include <sys/types.h>`
	`1279`	`+#ifndef POCO_ANDROID // Android doesn't have <ifaddrs.h>`
`1279`	`1280`	`#include <ifaddrs.h>`
	`1281`	`+#endif`
`1280`	`1282`	`#include <linux/if.h>`
`1281`	`1283`	`#include <linux/if_packet.h>`
`1282`	`1284`	`#include <net/if_arp.h>`
`@@ -1306,6 +1308,8 @@ static NetworkInterface::Type fromNative(unsigned arphrd)`
`1306`	`1308`	`}`
`1307`	`1309`	`}`
`1308`	`1310`
	`1311`	`+#ifndef POCO_ANDROID`
	`1312`	`+`
`1309`	`1313`	`void setInterfaceParams(struct ifaddrs* iface, NetworkInterfaceImpl& impl)`
`1310`	`1314`	`{`
`1311`	`1315`	`struct sockaddr_ll* sdl = (struct sockaddr_ll*) iface->ifa_addr;`
`@@ -1317,11 +1321,14 @@ void setInterfaceParams(struct ifaddrs* iface, NetworkInterfaceImpl& impl)`
`1317`	`1321`	`impl.setType(fromNative(sdl->sll_hatype));`
`1318`	`1322`	`}`
`1319`	`1323`
	`1324`	`+#endif`
	`1325`	`+`
`1320`	`1326`	`}`
`1321`	`1327`
`1322`	`1328`
`1323`	`1329`	`NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)`
`1324`	`1330`	`{`
	`1331`	`+#ifndef POCO_ANDROID`
`1325`	`1332`	`FastMutex::ScopedLock lock(_mutex);`
`1326`	`1333`	`Map result;`
`1327`	`1334`	`unsigned ifIndex = 0;`
`@@ -1420,6 +1427,9 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly)`
`1420`	`1427`	`if (ifaces) freeifaddrs(ifaces);`
`1421`	`1428`
`1422`	`1429`	`return result;`
	`1430`	`+#else`
	`1431`	`+ throw Poco::NotImplementedException("Not implemented in Android");`
	`1432`	`+#endif`
`1423`	`1433`	`}`
`1424`	`1434`
`1425`	`1435`