# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279813393 -3600
# Node ID b3a7d8e282623163cd5a3d4869d8ee5ae1d02bd0
# Parent  ac7f88fb2797022e41c25addfdf986e1603fa053# Parent  39aa16f3fdc2a08e7d7c53a9de7c3eb8c0ab9f17
Catchup to latest Symbian^4

diff -r 39aa16f3fdc2 -r b3a7d8e28262 policymanagement/policyengine/policyengineclient/src/Contexts.cpp
--- a/policymanagement/policyengine/policyengineclient/src/Contexts.cpp	Tue Jul 06 15:14:24 2010 +0300
+++ b/policymanagement/policyengine/policyengineclient/src/Contexts.cpp	Thu Jul 22 16:43:13 2010 +0100
@@ -311,7 +311,7 @@
 		delete operator[](i);
 	}
 
-	RArray::Close();
+	RArray<HBufC8*>::Close();
 }
 
 void RElementIdArray::SetListL( const TDesC8& aChilds)
diff -r 39aa16f3fdc2 -r b3a7d8e28262 policymanagement/policyengine/policyengineserver/src/PolicyProcessor.cpp
--- a/policymanagement/policyengine/policyengineserver/src/PolicyProcessor.cpp	Tue Jul 06 15:14:24 2010 +0300
+++ b/policymanagement/policyengine/policyengineserver/src/PolicyProcessor.cpp	Thu Jul 22 16:43:13 2010 +0100
@@ -62,7 +62,7 @@
 	container->iAttributeType = aAttributeTypes; 
 
 	//append to list
-	RArray::AppendL( container);
+	RArray<AttributeContainerHelper::TContainer*>::AppendL( container);
 		
 	//remove from cleanup
 	CleanupStack::Pop( 2, aAttribute);
@@ -82,7 +82,7 @@
 		delete container;
 	}
 	
-	RArray::Close();
+	RArray<AttributeContainerHelper::TContainer*>::Close();
 }
 
 
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/common/alertqueue/bld/NSmlAlertQueue.mmp
--- a/syncmlfw/common/alertqueue/bld/NSmlAlertQueue.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/common/alertqueue/bld/NSmlAlertQueue.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -26,7 +26,7 @@
 CAPABILITY 	CAP_GENERAL_DLL
 VENDORID 	VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabi
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/common/debug/bld/nsmldebug.mmp
--- a/syncmlfw/common/debug/bld/nsmldebug.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/common/debug/bld/nsmldebug.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -27,7 +27,7 @@
 VENDORID 	VID_DEFAULT
 
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/common/historylog/bld/nsmlhistorylog.mmp
--- a/syncmlfw/common/historylog/bld/nsmlhistorylog.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/common/historylog/bld/nsmlhistorylog.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -26,7 +26,7 @@
 CAPABILITY 	CAP_GENERAL_DLL
 VENDORID 	VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabi
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/common/http/bld/nsmlhttp.mmp
--- a/syncmlfw/common/http/bld/nsmlhttp.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/common/http/bld/nsmlhttp.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -27,7 +27,7 @@
 TARGETTYPE      dll
 UID		0x101F6DE4 270495204
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/common/obex/obexclient/bld/nsmlobexclient.mmp
--- a/syncmlfw/common/obex/obexclient/bld/nsmlobexclient.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/common/obex/obexclient/bld/nsmlobexclient.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -28,7 +28,7 @@
 TARGETTYPE      dll
 UID		0x101F6DE4 270495204
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/common/obex/obexcommserver/bld/nsmlobexcommcserver.mmp
--- a/syncmlfw/common/obex/obexcommserver/bld/nsmlobexcommcserver.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/common/obex/obexcommserver/bld/nsmlobexcommcserver.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -26,7 +26,7 @@
 TARGETTYPE      dll
 UID             0x1000008d 0x101F6DF0
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/common/obex/obexdmplugin/bld/nsmlobexdmplugin.mmp
--- a/syncmlfw/common/obex/obexdmplugin/bld/nsmlobexdmplugin.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/common/obex/obexdmplugin/bld/nsmlobexdmplugin.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -26,7 +26,7 @@
 // ECom Dll recognition UID followed by the unique UID for this dll
 UID 		0x10009D8D 0x101F968C
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/common/obex/obexdsplugin/bld/nsmlobexdsplugin.mmp
--- a/syncmlfw/common/obex/obexdsplugin/bld/nsmlobexdsplugin.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/common/obex/obexdsplugin/bld/nsmlobexdsplugin.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -30,7 +30,7 @@
 
 //MACRO __MDO_ENABLED
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/common/obex/obexserverbinding/bld/nsmlobexserverbinding.mmp
--- a/syncmlfw/common/obex/obexserverbinding/bld/nsmlobexserverbinding.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/common/obex/obexserverbinding/bld/nsmlobexserverbinding.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -27,7 +27,7 @@
 TARGETTYPE      dll
 UID		0x101F6DE4 270495204
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/common/sosserver_clientapi/bld/NSmlClientAPI.mmp
--- a/syncmlfw/common/sosserver_clientapi/bld/NSmlClientAPI.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/common/sosserver_clientapi/bld/NSmlClientAPI.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -27,7 +27,7 @@
 CAPABILITY 	CAP_CLIENT_DLL
 
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabi
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/common/sosserver_privateapi/bld/NSmlPrivateApi.mmp
--- a/syncmlfw/common/sosserver_privateapi/bld/NSmlPrivateApi.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/common/sosserver_privateapi/bld/NSmlPrivateApi.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -21,7 +21,7 @@
 #include "defaultcaps.hrh"
 
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabi
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/common/sosserver_transporthandler/bld/NSmlTransportHandler.mmp
--- a/syncmlfw/common/sosserver_transporthandler/bld/NSmlTransportHandler.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/common/sosserver_transporthandler/bld/NSmlTransportHandler.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -26,7 +26,7 @@
 CAPABILITY 	CAP_CLIENT_DLL
 VENDORID 	VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabi
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/common/syncagent/bld/NSmlAgentCommon.mmp
--- a/syncmlfw/common/syncagent/bld/NSmlAgentCommon.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/common/syncagent/bld/NSmlAgentCommon.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -24,7 +24,7 @@
 CAPABILITY 	CAP_GENERAL_DLL
 VENDORID 	VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/common/transport/bld/nsmltransport.mmp
--- a/syncmlfw/common/transport/bld/nsmltransport.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/common/transport/bld/nsmltransport.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -26,7 +26,7 @@
 TARGETTYPE      dll
 UID             0x101F6DE4 270495204
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/common/wbxml/bld/nsmlwbxml.mmp
--- a/syncmlfw/common/wbxml/bld/nsmlwbxml.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/common/wbxml/bld/nsmlwbxml.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -26,7 +26,7 @@
 TARGETTYPE      dll
 UID             0x1000008d 0x101F6DF0
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/common/xml/bld/nsmlxml.mmp
--- a/syncmlfw/common/xml/bld/nsmlxml.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/common/xml/bld/nsmlxml.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -24,7 +24,7 @@
 TARGETTYPE      dll
 UID             0x1000008d 0x101F6DF0
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/dm/dmutils/bld/nsmldmclientserverutils.mmp
--- a/syncmlfw/dm/dmutils/bld/nsmldmclientserverutils.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/dm/dmutils/bld/nsmldmclientserverutils.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -25,7 +25,7 @@
 CAPABILITY 	CAP_GENERAL_DLL
 VENDORID 	VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE			./DEF/eabidmclientserverutils
 #elif defined(WINSCW)
 DEFFILE			./DEF/bwinscwdmclientserverutils
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/dm/dmutils/bld/nsmldmiapmatcher.mmp
--- a/syncmlfw/dm/dmutils/bld/nsmldmiapmatcher.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/dm/dmutils/bld/nsmldmiapmatcher.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -27,7 +27,7 @@
 
 
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabiiapmatcher
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscwiapmatcher
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/dm/hostserver/dmhostserverbase/bld/nsmldmhostserverbase.mmp
--- a/syncmlfw/dm/hostserver/dmhostserverbase/bld/nsmldmhostserverbase.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/dm/hostserver/dmhostserverbase/bld/nsmldmhostserverbase.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -25,7 +25,7 @@
 TARGETTYPE      dll
 UID             0x1000008d 0x101F9A07
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE			./def/eabidmhostserver
 #elif defined(WINSCW)
 DEFFILE			./def/bwinscwdmhostserver
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/dm/settings/bld/nsmldmsettings.mmp
--- a/syncmlfw/dm/settings/bld/nsmldmsettings.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/dm/settings/bld/nsmldmsettings.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -20,7 +20,7 @@
 #include "defaultcaps.hrh"
 #include  <platform_paths.hrh>
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabidmsettings
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscwdmsettings
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/dm/syncagent/bld/nsmldmagent.mmp
--- a/syncmlfw/dm/syncagent/bld/nsmldmagent.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/dm/syncagent/bld/nsmldmagent.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -27,7 +27,7 @@
 VENDORID 	VID_DEFAULT
 
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/dm/treedbclient/bld/nsmldmtreedbclient.mmp
--- a/syncmlfw/dm/treedbclient/bld/nsmldmtreedbclient.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/dm/treedbclient/bld/nsmldmtreedbclient.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -26,7 +26,7 @@
 TARGETTYPE      dll
 UID             0x1000008d 268437795
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabi
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/dm/treedbhandler/bld/nsmldmtreedbhandler.mmp
--- a/syncmlfw/dm/treedbhandler/bld/nsmldmtreedbhandler.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/dm/treedbhandler/bld/nsmldmtreedbhandler.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -27,7 +27,7 @@
 VENDORID 	VID_DEFAULT
 
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/dm/treemodule/bld/nsmldmmodule.mmp
--- a/syncmlfw/dm/treemodule/bld/nsmldmmodule.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/dm/treemodule/bld/nsmldmmodule.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -26,7 +26,7 @@
 TARGETTYPE      dll
 UID             0x1000008d 268437795
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/ds/adapterlog/bld/NSmlAdapterLog.mmp
--- a/syncmlfw/ds/adapterlog/bld/NSmlAdapterLog.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/ds/adapterlog/bld/NSmlAdapterLog.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -26,7 +26,7 @@
 VENDORID	VID_DEFAULT
 
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/ds/adapters/dataproviderbase/bld/nsmldataproviderbase.mmp
--- a/syncmlfw/ds/adapters/dataproviderbase/bld/nsmldataproviderbase.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/ds/adapters/dataproviderbase/bld/nsmldataproviderbase.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -25,7 +25,7 @@
 CAPABILITY 		CAP_GENERAL_DLL
 VENDORID 		VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabidsdataproviderbase
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscwdsdataproviderbase
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/ds/agentlog/bld/nsmlagentlog.mmp
--- a/syncmlfw/ds/agentlog/bld/nsmlagentlog.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/ds/agentlog/bld/nsmlagentlog.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -27,7 +27,7 @@
 VENDORID	VID_DEFAULT
 
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/ds/dsutils/ProfileUtil/bld/NsmlProfileUtil.mmp
--- a/syncmlfw/ds/dsutils/ProfileUtil/bld/NsmlProfileUtil.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/ds/dsutils/ProfileUtil/bld/NsmlProfileUtil.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -23,7 +23,7 @@
 CAPABILITY    CAP_GENERAL_DLL
 VENDORID      VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabiProfileUtil.def
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscwProfileUtil.def
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/ds/dsutils/changefinder/bld/nsmlchangefinder.mmp
--- a/syncmlfw/ds/dsutils/changefinder/bld/nsmlchangefinder.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/ds/dsutils/changefinder/bld/nsmlchangefinder.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -26,7 +26,7 @@
 CAPABILITY  	CAP_GENERAL_DLL
 VENDORID    	VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabichangefinder
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscwchangefinder
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/ds/dsutils/dbcaps/bld/nsmldbcaps.mmp
--- a/syncmlfw/ds/dsutils/dbcaps/bld/nsmldbcaps.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/ds/dsutils/dbcaps/bld/nsmldbcaps.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -26,7 +26,7 @@
 CAPABILITY 	CAP_GENERAL_DLL
 VENDORID 	VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabidbcaps
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscwdbcaps
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/ds/dsutils/filter/bld/SyncMLDataFilter.mmp
--- a/syncmlfw/ds/dsutils/filter/bld/SyncMLDataFilter.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/ds/dsutils/filter/bld/SyncMLDataFilter.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -28,7 +28,7 @@
 TARGETTYPE      dll
 UID             0x1000008d 0x101F6DF0
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabi
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscw
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/ds/dsutils/filterutils/bld/nsmlfilter.mmp
--- a/syncmlfw/ds/dsutils/filterutils/bld/nsmlfilter.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/ds/dsutils/filterutils/bld/nsmlfilter.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -24,7 +24,7 @@
 TARGETTYPE      DLL
 UID		0x1000008d 0x101F6DE4
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabifilter
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscwfilter
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/ds/dsutils/storeformat/bld/nsmlDSstoreformat.mmp
--- a/syncmlfw/ds/dsutils/storeformat/bld/nsmlDSstoreformat.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/ds/dsutils/storeformat/bld/nsmlDSstoreformat.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -25,7 +25,7 @@
 TARGETTYPE	dll
 UID             0x1000008d 0x101F6DE4
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabidsctcaps
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscwdsctcaps
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/ds/hostserver/dshostclient/bld/nsmldshostclient.mmp
--- a/syncmlfw/ds/hostserver/dshostclient/bld/nsmldshostclient.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/ds/hostserver/dshostclient/bld/nsmldshostclient.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -31,7 +31,7 @@
 UID             0x1000008d 0x101F6DE4
 
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabidshostclient
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscwdshostclient
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/ds/hostserver/dshostserverbase/bld/nsmldshostserver.mmp
--- a/syncmlfw/ds/hostserver/dshostserverbase/bld/nsmldshostserver.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/ds/hostserver/dshostserverbase/bld/nsmldshostserver.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -29,7 +29,7 @@
 TARGETTYPE      dll
 UID             0x1000008d 0x2002DCFF
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./def/eabidshostserver
 #elif defined(WINSCW)
 DEFFILE		./def/bwinscwdshostserver
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/ds/settings/bld/nsmldssettings.mmp
--- a/syncmlfw/ds/settings/bld/nsmldssettings.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/ds/settings/bld/nsmldssettings.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -26,7 +26,7 @@
 UID             0x1000008d 0x101F6DE4
 VENDORID	VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE		./DEF/eabidssettings
 #elif defined(WINSCW)
 DEFFILE		./DEF/bwinscwdssettings
diff -r 39aa16f3fdc2 -r b3a7d8e28262 syncmlfw/ds/syncagent/bld/nsmldsagent.mmp
--- a/syncmlfw/ds/syncagent/bld/nsmldsagent.mmp	Tue Jul 06 15:14:24 2010 +0300
+++ b/syncmlfw/ds/syncagent/bld/nsmldsagent.mmp	Thu Jul 22 16:43:13 2010 +0100
@@ -24,7 +24,7 @@
 TARGETTYPE      dll
 UID             0x101F6DE4 0x101F6DE4
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE			./DEF/eabi
 #elif defined(WINSCW)
 DEFFILE			./DEF/bwinscw