iOS fixes

obiltschnig · obiltschnig · commit 4d3e02df739e · 2012-10-15T11:04:19.000Z
diff --git a/Net/src/NetworkInterface.cpp b/Net/src/NetworkInterface.cpp
@@ -1140,7 +1140,9 @@ NetworkInterface::NetworkInterfaceList NetworkInterface::list()
 #include <ifaddrs.h>
 #include <net/if.h>
 #include <net/if_dl.h>
+#ifndef POCO_NO_NET_IFTYPES
 #include <net/if_types.h>
+#endif
 
 
 namespace Poco {
@@ -1153,6 +1155,7 @@ NetworkInterface::Type fromNative(u_char nativeType)
 {
 	switch (nativeType) 
 	{
+#ifndef POCO_NO_NET_IFTYPES
 		case IFT_ETHER:		return NetworkInterface::NI_TYPE_ETHERNET_CSMACD;
 		case IFT_ISO88025:	return NetworkInterface::NI_TYPE_ISO88025_TOKENRING;
 		case IFT_FRELAY:	return NetworkInterface::NI_TYPE_FRAMERELAY;
@@ -1161,8 +1164,10 @@ NetworkInterface::Type fromNative(u_char nativeType)
 		case IFT_ATM:		return NetworkInterface::NI_TYPE_ATM;
 #if (POCO_OS != POCO_OS_SOLARIS)		
 		case IFT_IEEE1394:	return NetworkInterface::NI_TYPE_IEEE1394;
+#endif
 #endif
 		default:			return NetworkInterface::NI_TYPE_OTHER;
+
 	}
 }
 
diff --git a/build/config/iPhone b/build/config/iPhone
@@ -1,5 +1,5 @@
 #
-# $Id: //poco/1.4/build/config/iPhone#4 $
+# $Id: //poco/1.4/build/config/iPhone#3 $
 #
 # iPhone
 #
@@ -89,7 +89,7 @@ RELEASEOPT_LINK =
 #
 # System Specific Flags
 #
-SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_STAT64 -DPOCO_NO_SHAREDLIBS
+SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_STAT64 -DPOCO_NO_SHAREDLIBS -DPOCO_NO_NET_IFTYPES
 
 #
 # System Specific Libraries

Original file line number	Diff line number	Diff line change
`@@ -1140,7 +1140,9 @@ NetworkInterface::NetworkInterfaceList NetworkInterface::list()`
`1140`	`1140`	`#include <ifaddrs.h>`
`1141`	`1141`	`#include <net/if.h>`
`1142`	`1142`	`#include <net/if_dl.h>`
	`1143`	`+#ifndef POCO_NO_NET_IFTYPES`
`1143`	`1144`	`#include <net/if_types.h>`
	`1145`	`+#endif`
`1144`	`1146`
`1145`	`1147`
`1146`	`1148`	`namespace Poco {`
`@@ -1153,6 +1155,7 @@ NetworkInterface::Type fromNative(u_char nativeType)`
`1153`	`1155`	`{`
`1154`	`1156`	`switch (nativeType)`
`1155`	`1157`	`{`
	`1158`	`+#ifndef POCO_NO_NET_IFTYPES`
`1156`	`1159`	`case IFT_ETHER: return NetworkInterface::NI_TYPE_ETHERNET_CSMACD;`
`1157`	`1160`	`case IFT_ISO88025: return NetworkInterface::NI_TYPE_ISO88025_TOKENRING;`
`1158`	`1161`	`case IFT_FRELAY: return NetworkInterface::NI_TYPE_FRAMERELAY;`
`@@ -1161,8 +1164,10 @@ NetworkInterface::Type fromNative(u_char nativeType)`
`1161`	`1164`	`case IFT_ATM: return NetworkInterface::NI_TYPE_ATM;`
`1162`	`1165`	`#if (POCO_OS != POCO_OS_SOLARIS)`
`1163`	`1166`	`case IFT_IEEE1394: return NetworkInterface::NI_TYPE_IEEE1394;`
	`1167`	`+#endif`
`1164`	`1168`	`#endif`
`1165`	`1169`	`default: return NetworkInterface::NI_TYPE_OTHER;`
	`1170`	`+`
`1166`	`1171`	`}`
`1167`	`1172`	`}`
`1168`	`1173`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# $Id: //poco/1.4/build/config/iPhone#4 $`
	`2`	`+# $Id: //poco/1.4/build/config/iPhone#3 $`
`3`	`3`	`#`
`4`	`4`	`# iPhone`
`5`	`5`	`#`
`@@ -89,7 +89,7 @@ RELEASEOPT_LINK =`
`89`	`89`	`#`
`90`	`90`	`# System Specific Flags`
`91`	`91`	`#`
`92`		`-SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_STAT64 -DPOCO_NO_SHAREDLIBS`
	`92`	`+SYSFLAGS = -DPOCO_HAVE_IPv6 -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_STAT64 -DPOCO_NO_SHAREDLIBS -DPOCO_NO_NET_IFTYPES`
`93`	`93`
`94`	`94`	`#`
`95`	`95`	`# System Specific Libraries`