Browse Source

iOS fixes

Guenter Obiltschnig 13 years ago
parent
commit
4d3e02df73
2 changed files with 7 additions and 2 deletions
  1. 5 0
      Net/src/NetworkInterface.cpp
  2. 2 2
      build/config/iPhone

+ 5 - 0
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;
+
 	}
 }
 

+ 2 - 2
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