Catchup to latest Symbian^4 GCC_SURGE
authorWilliam Roberts <williamr@symbian.org>
Thu, 22 Jul 2010 16:48:06 +0100
branchGCC_SURGE
changeset 46 73696f712f10
parent 34 b433d36685ef (diff)
parent 42 88121cf79045 (current diff)
child 47 a96f0f8e6602
Catchup to latest Symbian^4
linklayercontrol/networkinterfacemgr/eabi/agentprcoreU.def
linklayerprotocols/pppnif/eabi/pppmainU.DEF
--- a/networkcontrol/iptransportlayer/eabi/iptransportimpl_v1u.def	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/iptransportlayer/eabi/iptransportimpl_v1u.def	Thu Jul 22 16:48:06 2010 +0100
@@ -4,14 +4,14 @@
 	_ZN31CIpSubConnectionProviderFactory4NewLEPv @ 3 NONAME
 	_ZN37CNetworkMetaConnectionProviderFactory4NewLEPv @ 4 NONAME
 	_ZN38CIpDefaultSubConnectionProviderFactory4NewLEPv @ 5 NONAME
-	_ZTIN4Meta18RMetaDataContainerINS_13SMetaDataEComEEE @ 6 NONAME
-	_ZTIN4Meta5TMetaI4TUidEE @ 7 NONAME
-	_ZTIN4Meta5TMetaIN5ESock11TAddrUpdateEEE @ 8 NONAME
-	_ZTIN4Meta5TMetaIN5ESock25RCFParameterFamilyBundleCEEE @ 9 NONAME
-	_ZTIN4Meta5TMetaIN8Messages7TNodeIdEEE @ 10 NONAME
-	_ZTVN4Meta18RMetaDataContainerINS_13SMetaDataEComEEE @ 11 NONAME
-	_ZTVN4Meta5TMetaI4TUidEE @ 12 NONAME
-	_ZTVN4Meta5TMetaIN5ESock11TAddrUpdateEEE @ 13 NONAME
-	_ZTVN4Meta5TMetaIN5ESock25RCFParameterFamilyBundleCEEE @ 14 NONAME
-	_ZTVN4Meta5TMetaIN8Messages7TNodeIdEEE @ 15 NONAME
+	_ZTIN4Meta18RMetaDataContainerINS_13SMetaDataEComEEE @ 6 NONAME ABSENT
+	_ZTIN4Meta5TMetaI4TUidEE @ 7 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock11TAddrUpdateEEE @ 8 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock25RCFParameterFamilyBundleCEEE @ 9 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN8Messages7TNodeIdEEE @ 10 NONAME ABSENT
+	_ZTVN4Meta18RMetaDataContainerINS_13SMetaDataEComEEE @ 11 NONAME ABSENT
+	_ZTVN4Meta5TMetaI4TUidEE @ 12 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock11TAddrUpdateEEE @ 13 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock25RCFParameterFamilyBundleCEEE @ 14 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN8Messages7TNodeIdEEE @ 15 NONAME ABSENT
 
--- a/networkcontrol/iptransportlayer/eabi/iptransportimplu.def	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/iptransportlayer/eabi/iptransportimplu.def	Thu Jul 22 16:48:06 2010 +0100
@@ -4,24 +4,24 @@
 	_ZN31CIpSubConnectionProviderFactory4NewLEPv @ 3 NONAME
 	_ZN37CNetworkMetaConnectionProviderFactory4NewLEPv @ 4 NONAME
 	_ZN38CIpDefaultSubConnectionProviderFactory4NewLEPv @ 5 NONAME
-	_ZTIN4Meta18RMetaDataContainerINS_13SMetaDataEComEEE @ 6 NONAME
-	_ZTIN4Meta5TMetaI4TUidEE @ 7 NONAME
-	_ZTIN4Meta5TMetaIN5ESock11TAddrUpdateEEE @ 8 NONAME
-	_ZTIN4Meta5TMetaIN5ESock25RCFParameterFamilyBundleCEEE @ 9 NONAME
-	_ZTIN4Meta5TMetaIN8Messages7TNodeIdEEE @ 10 NONAME
-	_ZTVN4Meta18RMetaDataContainerINS_13SMetaDataEComEEE @ 11 NONAME
-	_ZTVN4Meta5TMetaI4TUidEE @ 12 NONAME
-	_ZTVN4Meta5TMetaIN5ESock11TAddrUpdateEEE @ 13 NONAME
-	_ZTVN4Meta5TMetaIN5ESock25RCFParameterFamilyBundleCEEE @ 14 NONAME
-	_ZTVN4Meta5TMetaIN8Messages7TNodeIdEEE @ 15 NONAME
+	_ZTIN4Meta18RMetaDataContainerINS_13SMetaDataEComEEE @ 6 NONAME ABSENT
+	_ZTIN4Meta5TMetaI4TUidEE @ 7 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock11TAddrUpdateEEE @ 8 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock25RCFParameterFamilyBundleCEEE @ 9 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN8Messages7TNodeIdEEE @ 10 NONAME ABSENT
+	_ZTVN4Meta18RMetaDataContainerINS_13SMetaDataEComEEE @ 11 NONAME ABSENT
+	_ZTVN4Meta5TMetaI4TUidEE @ 12 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock11TAddrUpdateEEE @ 13 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock25RCFParameterFamilyBundleCEEE @ 14 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN8Messages7TNodeIdEEE @ 15 NONAME ABSENT
 	_ZN11XBearerInfo4NewLE16RParameterFamilyNS0_17TParameterSetTypeE @ 16 NONAME
 	_ZN11XBearerInfo4NewLEv @ 17 NONAME
 	_ZTI11XBearerInfo @ 18 NONAME
 	_ZTI21CTCPReceiveWindowSize @ 19 NONAME
 	_ZTI25CDfltTCPReceiveWindowSize @ 20 NONAME
-	_ZTIN4Meta5TMetaIiEE @ 21 NONAME
+	_ZTIN4Meta5TMetaIiEE @ 21 NONAME ABSENT
 	_ZTV11XBearerInfo @ 22 NONAME
 	_ZTV21CTCPReceiveWindowSize @ 23 NONAME
 	_ZTV25CDfltTCPReceiveWindowSize @ 24 NONAME
-	_ZTVN4Meta5TMetaIiEE @ 25 NONAME
+	_ZTVN4Meta5TMetaIiEE @ 25 NONAME ABSENT
 
--- a/networkcontrol/iptransportlayer/src/ipcprups_states.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/iptransportlayer/src/ipcprups_states.cpp	Thu Jul 22 16:48:06 2010 +0100
@@ -26,7 +26,7 @@
 
 #include "IPCpr.h"
 #include "ipcprups_states.h"
-#include "../../../../commsfw/datacommsserver/esockserver/inc/ss_internal_activities.h"
+#include <comms-infras/ss_internal_activities.h>
 #include <comms-infras/ss_nodemessages_factory.h>
 
 #include <comms-infras/upsmessages.h>
--- a/networkcontrol/qosfwconfig/QoSTesting/TS_QoS/eabi/ts_qosU.def	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/qosfwconfig/QoSTesting/TS_QoS/eabi/ts_qosU.def	Thu Jul 22 16:48:06 2010 +0100
@@ -103,7 +103,7 @@
 	_ZTI13CTestSuiteQoS @ 102 NONAME
 	_ZTI14CEventListener @ 103 NONAME
 	_ZTI16CSubConnListener @ 104 NONAME
-	_ZTIN4Meta18RMetaDataContainerINS_13SMetaDataEComEEE @ 105 NONAME
+	_ZTIN4Meta18RMetaDataContainerINS_13SMetaDataEComEEE @ 105 NONAME ABSENT
 	_ZTV12CMyScheduler @ 106 NONAME
 	_ZTV12CQoSListener @ 107 NONAME
 	_ZTV12CQoSTest_001 @ 108 NONAME
@@ -207,5 +207,5 @@
 	_ZTV13CTestSuiteQoS @ 206 NONAME
 	_ZTV14CEventListener @ 207 NONAME
 	_ZTV16CSubConnListener @ 208 NONAME
-	_ZTVN4Meta18RMetaDataContainerINS_13SMetaDataEComEEE @ 209 NONAME
+	_ZTVN4Meta18RMetaDataContainerINS_13SMetaDataEComEEE @ 209 NONAME ABSENT
 
--- a/networkcontrol/qosipscpr/src/ipscpr.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkcontrol/qosipscpr/src/ipscpr.cpp	Thu Jul 22 16:48:06 2010 +0100
@@ -39,7 +39,7 @@
 
 
 //TODO remove this ECFActivityDataClientJoin activity
-#include "../../../../commsfw/datacommsserver/esockserver/inc/ss_internal_activities.h"
+#include <comms-infras/ss_internal_activities.h>
 
 #if defined __FLOG_ACTIVE || defined SYMBIAN_TRACE_ENABLE
 	#define KIPSCprTag KESockSubConnectionTag
--- a/networkingtestandutils/networkingunittest/eabi/esock_esockv3upsu.def	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkingtestandutils/networkingunittest/eabi/esock_esockv3upsu.def	Thu Jul 22 16:48:06 2010 +0100
@@ -1675,43 +1675,43 @@
 	_ZTIN17SubSessActivities14CCloseActivityE @ 1674 NONAME
 	_ZTIN17SubSessActivities24CESockClientActivityBaseE @ 1675 NONAME
 	_ZTIN24PRDataClientStopActivity23TNoTagOrProviderStoppedE @ 1676 NONAME
-	_ZTIN4Meta11TMetaObjectIN5ESock15TSelectionPrefsEEE @ 1677 NONAME
-	_ZTIN4Meta18RMetaDataContainerIN5ESock20XConnectionQueryBaseEEE @ 1678 NONAME
-	_ZTIN4Meta18RMetaDataContainerINS_13SMetaDataEComEEE @ 1679 NONAME
-	_ZTIN4Meta5TMetaI12TNifProgressEE @ 1680 NONAME
-	_ZTIN4Meta5TMetaI15TConnectionInfoEE @ 1681 NONAME
-	_ZTIN4Meta5TMetaI21TSupportedCommsApiExtEE @ 1682 NONAME
-	_ZTIN4Meta5TMetaI25TSubConnectionClosedEventEE @ 1683 NONAME
-	_ZTIN4Meta5TMetaI25TSubConnectionOpenedEventEE @ 1684 NONAME
-	_ZTIN4Meta5TMetaI4TUidEE @ 1685 NONAME
-	_ZTIN4Meta5TMetaI5TBuf8ILi124EEEE @ 1686 NONAME
-	_ZTIN4Meta5TMetaI9RMessage2EE @ 1687 NONAME
-	_ZTIN4Meta5TMetaI9TConnPrefEE @ 1688 NONAME
-	_ZTIN4Meta5TMetaIN5ESock11TAddrUpdateEEE @ 1689 NONAME
-	_ZTIN4Meta5TMetaIN5ESock11TErrContextEEE @ 1690 NONAME
-	_ZTIN4Meta5TMetaIN5ESock12TCommsBinderEEE @ 1691 NONAME
-	_ZTIN4Meta5TMetaIN5ESock12TErrResponseEEE @ 1692 NONAME
-	_ZTIN4Meta5TMetaIN5ESock13TProviderInfoEEE @ 1693 NONAME
-	_ZTIN4Meta5TMetaIN5ESock14RNodeInterfaceEEE @ 1694 NONAME
-	_ZTIN4Meta5TMetaIN5ESock17TCFNodeSignalBase10TMessageIdEEE @ 1695 NONAME
-	_ZTIN4Meta5TMetaIN5ESock19TAvailabilityStatusEEE @ 1696 NONAME
-	_ZTIN4Meta5TMetaIN5ESock20TFactoryObjectParamsEEE @ 1697 NONAME
-	_ZTIN4Meta5TMetaIN5ESock24TCprGetConnectionSetting22TConnectionSettingTypeEEE @ 1698 NONAME
-	_ZTIN4Meta5TMetaIN5ESock24TDataMonitoringDirectionEEE @ 1699 NONAME
-	_ZTIN4Meta5TMetaIN5ESock32TAvailabilitySubscriptionOptionsEEE @ 1700 NONAME
-	_ZTIN4Meta5TMetaIN5ESock8TCommsIdEEE @ 1701 NONAME
-	_ZTIN4Meta5TMetaIN8Elements12RResponseMsgEEE @ 1702 NONAME
-	_ZTIN4Meta5TMetaIP13RPointerArrayI15TConnectionInfoEEE @ 1703 NONAME
-	_ZTIN4Meta5TMetaIP22CSubConParameterBundleEE @ 1704 NONAME
-	_ZTIN4Meta5TMetaIP9RMessage2EE @ 1705 NONAME
-	_ZTIN4Meta5TMetaIPKNS_9SMetaDataEEE @ 1706 NONAME
-	_ZTIN4Meta5TMetaIPN5ESock14CRefCountOwnerIK24CSubConNotificationEventEEEE @ 1707 NONAME
-	_ZTIN4Meta5TMetaIPN5ESock35TDataMonitoringProvisioningInfoBaseEEE @ 1708 NONAME
-	_ZTIN4Meta5TMetaIPNS_9SMetaDataEEE @ 1709 NONAME
-	_ZTIN4Meta5TMetaIPPN5ESock16XCommsDataObjectEEE @ 1710 NONAME
-	_ZTIN4Meta5TMetaIPvEE @ 1711 NONAME
-	_ZTIN4Meta5TMetaIiEE @ 1712 NONAME
-	_ZTIN4Meta5TMetaIjEE @ 1713 NONAME
+	_ZTIN4Meta11TMetaObjectIN5ESock15TSelectionPrefsEEE @ 1677 NONAME ABSENT
+	_ZTIN4Meta18RMetaDataContainerIN5ESock20XConnectionQueryBaseEEE @ 1678 NONAME ABSENT
+	_ZTIN4Meta18RMetaDataContainerINS_13SMetaDataEComEEE @ 1679 NONAME ABSENT
+	_ZTIN4Meta5TMetaI12TNifProgressEE @ 1680 NONAME ABSENT
+	_ZTIN4Meta5TMetaI15TConnectionInfoEE @ 1681 NONAME ABSENT
+	_ZTIN4Meta5TMetaI21TSupportedCommsApiExtEE @ 1682 NONAME ABSENT
+	_ZTIN4Meta5TMetaI25TSubConnectionClosedEventEE @ 1683 NONAME ABSENT
+	_ZTIN4Meta5TMetaI25TSubConnectionOpenedEventEE @ 1684 NONAME ABSENT
+	_ZTIN4Meta5TMetaI4TUidEE @ 1685 NONAME ABSENT
+	_ZTIN4Meta5TMetaI5TBuf8ILi124EEEE @ 1686 NONAME ABSENT
+	_ZTIN4Meta5TMetaI9RMessage2EE @ 1687 NONAME ABSENT
+	_ZTIN4Meta5TMetaI9TConnPrefEE @ 1688 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock11TAddrUpdateEEE @ 1689 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock11TErrContextEEE @ 1690 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock12TCommsBinderEEE @ 1691 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock12TErrResponseEEE @ 1692 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock13TProviderInfoEEE @ 1693 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock14RNodeInterfaceEEE @ 1694 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock17TCFNodeSignalBase10TMessageIdEEE @ 1695 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock19TAvailabilityStatusEEE @ 1696 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock20TFactoryObjectParamsEEE @ 1697 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock24TCprGetConnectionSetting22TConnectionSettingTypeEEE @ 1698 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock24TDataMonitoringDirectionEEE @ 1699 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock32TAvailabilitySubscriptionOptionsEEE @ 1700 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN5ESock8TCommsIdEEE @ 1701 NONAME ABSENT
+	_ZTIN4Meta5TMetaIN8Elements12RResponseMsgEEE @ 1702 NONAME ABSENT
+	_ZTIN4Meta5TMetaIP13RPointerArrayI15TConnectionInfoEEE @ 1703 NONAME ABSENT
+	_ZTIN4Meta5TMetaIP22CSubConParameterBundleEE @ 1704 NONAME ABSENT
+	_ZTIN4Meta5TMetaIP9RMessage2EE @ 1705 NONAME ABSENT
+	_ZTIN4Meta5TMetaIPKNS_9SMetaDataEEE @ 1706 NONAME ABSENT
+	_ZTIN4Meta5TMetaIPN5ESock14CRefCountOwnerIK24CSubConNotificationEventEEEE @ 1707 NONAME ABSENT
+	_ZTIN4Meta5TMetaIPN5ESock35TDataMonitoringProvisioningInfoBaseEEE @ 1708 NONAME ABSENT
+	_ZTIN4Meta5TMetaIPNS_9SMetaDataEEE @ 1709 NONAME ABSENT
+	_ZTIN4Meta5TMetaIPPN5ESock16XCommsDataObjectEEE @ 1710 NONAME ABSENT
+	_ZTIN4Meta5TMetaIPvEE @ 1711 NONAME ABSENT
+	_ZTIN4Meta5TMetaIiEE @ 1712 NONAME ABSENT
+	_ZTIN4Meta5TMetaIjEE @ 1713 NONAME ABSENT
 	_ZTIN5ESock10TSigBundleE @ 1714 NONAME
 	_ZTIN5ESock10TSigNumberE @ 1715 NONAME
 	_ZTIN5ESock11AApiExtBaseE @ 1716 NONAME
@@ -2058,43 +2058,43 @@
 	_ZTVN17SubSessActivities14CCloseActivityE @ 2057 NONAME
 	_ZTVN17SubSessActivities24CESockClientActivityBaseE @ 2058 NONAME
 	_ZTVN24PRDataClientStopActivity23TNoTagOrProviderStoppedE @ 2059 NONAME
-	_ZTVN4Meta11TMetaObjectIN5ESock15TSelectionPrefsEEE @ 2060 NONAME
-	_ZTVN4Meta18RMetaDataContainerIN5ESock20XConnectionQueryBaseEEE @ 2061 NONAME
-	_ZTVN4Meta18RMetaDataContainerINS_13SMetaDataEComEEE @ 2062 NONAME
-	_ZTVN4Meta5TMetaI12TNifProgressEE @ 2063 NONAME
-	_ZTVN4Meta5TMetaI15TConnectionInfoEE @ 2064 NONAME
-	_ZTVN4Meta5TMetaI21TSupportedCommsApiExtEE @ 2065 NONAME
-	_ZTVN4Meta5TMetaI25TSubConnectionClosedEventEE @ 2066 NONAME
-	_ZTVN4Meta5TMetaI25TSubConnectionOpenedEventEE @ 2067 NONAME
-	_ZTVN4Meta5TMetaI4TUidEE @ 2068 NONAME
-	_ZTVN4Meta5TMetaI5TBuf8ILi124EEEE @ 2069 NONAME
-	_ZTVN4Meta5TMetaI9RMessage2EE @ 2070 NONAME
-	_ZTVN4Meta5TMetaI9TConnPrefEE @ 2071 NONAME
-	_ZTVN4Meta5TMetaIN5ESock11TAddrUpdateEEE @ 2072 NONAME
-	_ZTVN4Meta5TMetaIN5ESock11TErrContextEEE @ 2073 NONAME
-	_ZTVN4Meta5TMetaIN5ESock12TCommsBinderEEE @ 2074 NONAME
-	_ZTVN4Meta5TMetaIN5ESock12TErrResponseEEE @ 2075 NONAME
-	_ZTVN4Meta5TMetaIN5ESock13TProviderInfoEEE @ 2076 NONAME
-	_ZTVN4Meta5TMetaIN5ESock14RNodeInterfaceEEE @ 2077 NONAME
-	_ZTVN4Meta5TMetaIN5ESock17TCFNodeSignalBase10TMessageIdEEE @ 2078 NONAME
-	_ZTVN4Meta5TMetaIN5ESock19TAvailabilityStatusEEE @ 2079 NONAME
-	_ZTVN4Meta5TMetaIN5ESock20TFactoryObjectParamsEEE @ 2080 NONAME
-	_ZTVN4Meta5TMetaIN5ESock24TCprGetConnectionSetting22TConnectionSettingTypeEEE @ 2081 NONAME
-	_ZTVN4Meta5TMetaIN5ESock24TDataMonitoringDirectionEEE @ 2082 NONAME
-	_ZTVN4Meta5TMetaIN5ESock32TAvailabilitySubscriptionOptionsEEE @ 2083 NONAME
-	_ZTVN4Meta5TMetaIN5ESock8TCommsIdEEE @ 2084 NONAME
-	_ZTVN4Meta5TMetaIN8Elements12RResponseMsgEEE @ 2085 NONAME
-	_ZTVN4Meta5TMetaIP13RPointerArrayI15TConnectionInfoEEE @ 2086 NONAME
-	_ZTVN4Meta5TMetaIP22CSubConParameterBundleEE @ 2087 NONAME
-	_ZTVN4Meta5TMetaIP9RMessage2EE @ 2088 NONAME
-	_ZTVN4Meta5TMetaIPKNS_9SMetaDataEEE @ 2089 NONAME
-	_ZTVN4Meta5TMetaIPN5ESock14CRefCountOwnerIK24CSubConNotificationEventEEEE @ 2090 NONAME
-	_ZTVN4Meta5TMetaIPN5ESock35TDataMonitoringProvisioningInfoBaseEEE @ 2091 NONAME
-	_ZTVN4Meta5TMetaIPNS_9SMetaDataEEE @ 2092 NONAME
-	_ZTVN4Meta5TMetaIPPN5ESock16XCommsDataObjectEEE @ 2093 NONAME
-	_ZTVN4Meta5TMetaIPvEE @ 2094 NONAME
-	_ZTVN4Meta5TMetaIiEE @ 2095 NONAME
-	_ZTVN4Meta5TMetaIjEE @ 2096 NONAME
+	_ZTVN4Meta11TMetaObjectIN5ESock15TSelectionPrefsEEE @ 2060 NONAME ABSENT
+	_ZTVN4Meta18RMetaDataContainerIN5ESock20XConnectionQueryBaseEEE @ 2061 NONAME ABSENT
+	_ZTVN4Meta18RMetaDataContainerINS_13SMetaDataEComEEE @ 2062 NONAME ABSENT
+	_ZTVN4Meta5TMetaI12TNifProgressEE @ 2063 NONAME ABSENT
+	_ZTVN4Meta5TMetaI15TConnectionInfoEE @ 2064 NONAME ABSENT
+	_ZTVN4Meta5TMetaI21TSupportedCommsApiExtEE @ 2065 NONAME ABSENT
+	_ZTVN4Meta5TMetaI25TSubConnectionClosedEventEE @ 2066 NONAME ABSENT
+	_ZTVN4Meta5TMetaI25TSubConnectionOpenedEventEE @ 2067 NONAME ABSENT
+	_ZTVN4Meta5TMetaI4TUidEE @ 2068 NONAME ABSENT
+	_ZTVN4Meta5TMetaI5TBuf8ILi124EEEE @ 2069 NONAME ABSENT
+	_ZTVN4Meta5TMetaI9RMessage2EE @ 2070 NONAME ABSENT
+	_ZTVN4Meta5TMetaI9TConnPrefEE @ 2071 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock11TAddrUpdateEEE @ 2072 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock11TErrContextEEE @ 2073 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock12TCommsBinderEEE @ 2074 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock12TErrResponseEEE @ 2075 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock13TProviderInfoEEE @ 2076 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock14RNodeInterfaceEEE @ 2077 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock17TCFNodeSignalBase10TMessageIdEEE @ 2078 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock19TAvailabilityStatusEEE @ 2079 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock20TFactoryObjectParamsEEE @ 2080 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock24TCprGetConnectionSetting22TConnectionSettingTypeEEE @ 2081 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock24TDataMonitoringDirectionEEE @ 2082 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock32TAvailabilitySubscriptionOptionsEEE @ 2083 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN5ESock8TCommsIdEEE @ 2084 NONAME ABSENT
+	_ZTVN4Meta5TMetaIN8Elements12RResponseMsgEEE @ 2085 NONAME ABSENT
+	_ZTVN4Meta5TMetaIP13RPointerArrayI15TConnectionInfoEEE @ 2086 NONAME ABSENT
+	_ZTVN4Meta5TMetaIP22CSubConParameterBundleEE @ 2087 NONAME ABSENT
+	_ZTVN4Meta5TMetaIP9RMessage2EE @ 2088 NONAME ABSENT
+	_ZTVN4Meta5TMetaIPKNS_9SMetaDataEEE @ 2089 NONAME ABSENT
+	_ZTVN4Meta5TMetaIPN5ESock14CRefCountOwnerIK24CSubConNotificationEventEEEE @ 2090 NONAME ABSENT
+	_ZTVN4Meta5TMetaIPN5ESock35TDataMonitoringProvisioningInfoBaseEEE @ 2091 NONAME ABSENT
+	_ZTVN4Meta5TMetaIPNS_9SMetaDataEEE @ 2092 NONAME ABSENT
+	_ZTVN4Meta5TMetaIPPN5ESock16XCommsDataObjectEEE @ 2093 NONAME ABSENT
+	_ZTVN4Meta5TMetaIPvEE @ 2094 NONAME ABSENT
+	_ZTVN4Meta5TMetaIiEE @ 2095 NONAME ABSENT
+	_ZTVN4Meta5TMetaIjEE @ 2096 NONAME ABSENT
 	_ZTVN5ESock10TSigBundleE @ 2097 NONAME
 	_ZTVN5ESock10TSigNumberE @ 2098 NONAME
 	_ZTVN5ESock11AApiExtBaseE @ 2099 NONAME
@@ -2306,9 +2306,9 @@
 	_ZNK5ESock21AIPCClientPlatsecInfo21GetProcessAndThreadIdEjR10TProcessIdR9TThreadId @ 2305 NONAME
 	_ZNK5ESock24ASubSessionPlatsecApiExt21GetProcessAndThreadIdER10TProcessIdR9TThreadId @ 2306 NONAME
 	_ZTI24CUPSAccessPointConfigExt @ 2307 NONAME
-	_ZTIN4Meta5TMetaIN5ESock25TPolicyCheckRequestParamsEEE @ 2308 NONAME
+	_ZTIN4Meta5TMetaIN5ESock25TPolicyCheckRequestParamsEEE @ 2308 NONAME ABSENT
 	_ZTIN5ESock17TSigUpsParametersE @ 2309 NONAME
 	_ZTV24CUPSAccessPointConfigExt @ 2310 NONAME
-	_ZTVN4Meta5TMetaIN5ESock25TPolicyCheckRequestParamsEEE @ 2311 NONAME
+	_ZTVN4Meta5TMetaIN5ESock25TPolicyCheckRequestParamsEEE @ 2311 NONAME ABSENT
 	_ZTVN5ESock17TSigUpsParametersE @ 2312 NONAME
 
--- a/networkprotocols/ipeventnotifier/eabi/ipeventnotifier_v1U.DEF	Tue Jul 06 16:04:34 2010 +0300
+++ b/networkprotocols/ipeventnotifier/eabi/ipeventnotifier_v1U.DEF	Thu Jul 22 16:48:06 2010 +0100
@@ -6,14 +6,14 @@
 	_ZTV16CIPEventListener @ 5 NONAME ; #<VT>#
 	_ZTV16CIPEventNotifier @ 6 NONAME ; #<VT>#
 	_ZTV30CIPEventNotifierProtocolFamily @ 7 NONAME ; #<VT>#
-	_ZTIN4Meta11TMetaVarLenI5RBuf8EE @ 8 NONAME ; #<TI>#
-	_ZTIN4Meta11TMetaVarLenI6RBuf16EE @ 9 NONAME ; #<TI>#
-	_ZTIN4Meta12TMetaVarLen8I5RBuf8EE @ 10 NONAME ; #<TI>#
-	_ZTIN4Meta13TMetaVarLen16I6RBuf16EE @ 11 NONAME ; #<TI>#
-	_ZTVN4Meta11TMetaVarLenI5RBuf8EE @ 12 NONAME ; #<VT>#
-	_ZTVN4Meta11TMetaVarLenI6RBuf16EE @ 13 NONAME ; #<VT>#
-	_ZTVN4Meta12TMetaVarLen8I5RBuf8EE @ 14 NONAME ; #<VT>#
-	_ZTVN4Meta13TMetaVarLen16I6RBuf16EE @ 15 NONAME ; #<VT>#
+	_ZTIN4Meta11TMetaVarLenI5RBuf8EE @ 8 NONAME ABSENT ; #<TI>#
+	_ZTIN4Meta11TMetaVarLenI6RBuf16EE @ 9 NONAME ABSENT ; #<TI>#
+	_ZTIN4Meta12TMetaVarLen8I5RBuf8EE @ 10 NONAME ABSENT ; #<TI>#
+	_ZTIN4Meta13TMetaVarLen16I6RBuf16EE @ 11 NONAME ABSENT ; #<TI>#
+	_ZTVN4Meta11TMetaVarLenI5RBuf8EE @ 12 NONAME ABSENT ; #<VT>#
+	_ZTVN4Meta11TMetaVarLenI6RBuf16EE @ 13 NONAME ABSENT ; #<VT>#
+	_ZTVN4Meta12TMetaVarLen8I5RBuf8EE @ 14 NONAME ABSENT ; #<VT>#
+	_ZTVN4Meta13TMetaVarLen16I6RBuf16EE @ 15 NONAME ABSENT ; #<VT>#
 	_ZTI22CDHCPUnicastTranslator @ 16 NONAME ; #<TI>#
 	_ZTV22CDHCPUnicastTranslator @ 17 NONAME ; #<VT>#
 
--- a/networksecurity/ipsec/ipsec6/src/sa_crypt.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/src/sa_crypt.cpp	Thu Jul 22 16:48:06 2010 +0100
@@ -26,7 +26,7 @@
 #include "sa_crypt.h"
 #include <networking/ipsecerr.h>
 #include "ipseccrypto.h"
-#include "keys.h"
+#include <cryptospi/keys.h>
 #include <cryptospi/cryptospidef.h>
 #ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
 #include <cryptospi/cryptomacapi.h>
--- a/networksecurity/ipsec/ipsec6/src/sadb.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/src/sadb.cpp	Thu Jul 22 16:48:06 2010 +0100
@@ -26,7 +26,7 @@
 
 // This ungainly manoevure is forced on us because the offset is not evaluated early enough by GCC3.4 to be
 // passed as a template parameter
-#if defined(__X86GCC__) || defined(__GCCE__)
+#if defined(__X86GCC__)
 #define KSecurityAssocTimeoutOffset 256
 __ASSERT_COMPILE(KSecurityAssocTimeoutOffset == _FOFF(CSecurityAssoc, iTimeout));
 #else
--- a/networksecurity/ipsec/ipseccrypto/src/ipseccrypto_prt.cpp	Tue Jul 06 16:04:34 2010 +0300
+++ b/networksecurity/ipsec/ipseccrypto/src/ipseccrypto_prt.cpp	Thu Jul 22 16:48:06 2010 +0100
@@ -23,9 +23,9 @@
 #include <rijndael.h>
 #include <hash.h>
 
-#include "keys.h"
+#include <cryptospi/keys.h>
 #include <cryptospi/cryptospidef.h>
-#include "cryptosymmetriccipherapi.h"
+#include <cryptospi/cryptosymmetriccipherapi.h>
 #ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
 #include "ruleselector.h"
 #include "plugincharacteristics.h"
--- a/tcpiputils/dhcp/eabi/DHCPServU.DEF	Tue Jul 06 16:04:34 2010 +0300
+++ b/tcpiputils/dhcp/eabi/DHCPServU.DEF	Thu Jul 22 16:48:06 2010 +0100
@@ -38,8 +38,8 @@
 	_ZTI22CDHCPInformationConfig @ 37 NONAME ; #<TI>#
 	_ZTI23CDHCPAddressAcquisition @ 38 NONAME ; #<TI>#
 	_ZTI24CDHCPIP6ListenToNeighbor @ 39 NONAME ; #<TI>#
-	_ZTI5CItemI15TValueBigEndianE @ 40 NONAME ; #<TI>#
-	_ZTI5CItemI9TConstantE @ 41 NONAME ; #<TI>#
+	_ZTI5CItemI15TValueBigEndianE @ 40 NONAME ABSENT ; #<TI>#
+	_ZTI5CItemI9TConstantE @ 41 NONAME ABSENT ; #<TI>#
 	_ZTI5CItemIN6DHCPv413TOptionHeaderI13TLittleEndianEEE @ 42 NONAME ; #<TI>#
 	_ZTI5CItemIN6DHCPv613TOptionHeaderI10TBigEndianEEE @ 43 NONAME ; #<TI>#
 	_ZTIN6DHCPv411COptionListE @ 44 NONAME ; #<TI>#
@@ -88,8 +88,8 @@
 	_ZTV22CDHCPInformationConfig @ 87 NONAME ; #<VT>#
 	_ZTV23CDHCPAddressAcquisition @ 88 NONAME ; #<VT>#
 	_ZTV24CDHCPIP6ListenToNeighbor @ 89 NONAME ; #<VT>#
-	_ZTV5CItemI15TValueBigEndianE @ 90 NONAME ; #<VT>#
-	_ZTV5CItemI9TConstantE @ 91 NONAME ; #<VT>#
+	_ZTV5CItemI15TValueBigEndianE @ 90 NONAME ABSENT ; #<VT>#
+	_ZTV5CItemI9TConstantE @ 91 NONAME ABSENT ; #<VT>#
 	_ZTV5CItemIN6DHCPv413TOptionHeaderI13TLittleEndianEEE @ 92 NONAME ; #<VT>#
 	_ZTV5CItemIN6DHCPv613TOptionHeaderI10TBigEndianEEE @ 93 NONAME ; #<VT>#
 	_ZTVN6DHCPv411COptionListE @ 94 NONAME ; #<VT>#