--- a/webservices/wsconnection/group/senserviceconnection.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wsconnection/group/senserviceconnection.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -114,7 +114,7 @@
#endif
LANG SC
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../eabi/SENSERVCONN.DEF
#elif defined(WINSCW)
DEFFILE ../BWINSCW/SENSERVCONN.DEF
--- a/webservices/wsconnectionagent/eabi/senconnagent32u.def Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wsconnectionagent/eabi/senconnagent32u.def Thu Jul 22 16:44:27 2010 +0100
@@ -1,12 +1,12 @@
EXPORTS
_ZN19CSenConnAgentServer4OpenEv @ 1 NONAME
_ZN19CSenConnAgentServer5CloseEv @ 2 NONAME
- _ZTIN4Meta11TMetaVarLenI5RBuf8EE @ 3 NONAME ; #<TI>#
- _ZTIN4Meta11TMetaVarLenI6RBuf16EE @ 4 NONAME ; #<TI>#
- _ZTIN4Meta12TMetaVarLen8I5RBuf8EE @ 5 NONAME ; #<TI>#
- _ZTIN4Meta13TMetaVarLen16I6RBuf16EE @ 6 NONAME ; #<TI>#
- _ZTVN4Meta11TMetaVarLenI5RBuf8EE @ 7 NONAME ; #<VT>#
- _ZTVN4Meta11TMetaVarLenI6RBuf16EE @ 8 NONAME ; #<VT>#
- _ZTVN4Meta12TMetaVarLen8I5RBuf8EE @ 9 NONAME ; #<VT>#
- _ZTVN4Meta13TMetaVarLen16I6RBuf16EE @ 10 NONAME ; #<VT>#
+ _ZTIN4Meta11TMetaVarLenI5RBuf8EE @ 3 NONAME ABSENT ; #<TI>#
+ _ZTIN4Meta11TMetaVarLenI6RBuf16EE @ 4 NONAME ABSENT ; #<TI>#
+ _ZTIN4Meta12TMetaVarLen8I5RBuf8EE @ 5 NONAME ABSENT ; #<TI>#
+ _ZTIN4Meta13TMetaVarLen16I6RBuf16EE @ 6 NONAME ABSENT ; #<TI>#
+ _ZTVN4Meta11TMetaVarLenI5RBuf8EE @ 7 NONAME ABSENT ; #<VT>#
+ _ZTVN4Meta11TMetaVarLenI6RBuf16EE @ 8 NONAME ABSENT ; #<VT>#
+ _ZTVN4Meta12TMetaVarLen8I5RBuf8EE @ 9 NONAME ABSENT ; #<VT>#
+ _ZTVN4Meta13TMetaVarLen16I6RBuf16EE @ 10 NONAME ABSENT ; #<VT>#
--- a/webservices/wsconnectionagent/group/senconnagent.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wsconnectionagent/group/senconnagent.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -75,7 +75,7 @@
#endif
LANG SC
-#if defined(ARMCC)
+#if defined(EABI)
#ifdef __ENABLE_ALR__
DEFFILE ../EABI/senconnagent32.def
#else
--- a/webservices/wscredentialmanager/group/sencredentialmanager.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wscredentialmanager/group/sencredentialmanager.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -112,7 +112,7 @@
LIBRARY wsxml.lib
#endif
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../eabi/SENCREDENTIALMANAGER.DEF
#elif defined(WINSCW)
DEFFILE ../BWINSCW/SENCREDENTIALMANAGER.DEF
--- a/webservices/wsdescription/group/senservicedescription.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wsdescription/group/senservicedescription.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -102,7 +102,7 @@
LIBRARY xmlframework.lib
#endif // otherwise cXMLreader is used
-#if defined(ARMCC)
+#if defined(EABI)
#if defined (RD_SEN_COMPILE_SIS_PACKAGE_FILES)
DEFFILE ../EABI/SENSERVDESC_V2.DEF
#else
--- a/webservices/wsfragment/group/senfragment.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wsfragment/group/senfragment.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -86,7 +86,7 @@
LIBRARY WsStarXmlEngineUtils.lib
#endif
- #if defined(ARMCC)
+ #if defined(EABI)
DEFFILE ../eabi/SenFragment_3.0.DEF
#elif defined(WINSCW)
DEFFILE ../BWINSCW/SenFragment_3.0.DEF
--- a/webservices/wsframework/group/senframework.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wsframework/group/senframework.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -129,7 +129,7 @@
LIBRARY WsStarXmlEngineSerializer.lib
#endif
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../eabi/SENFRAMEWORK.DEF
#elif defined(WINSCW)
DEFFILE ../BWINSCW/SENFRAMEWORK.DEF
--- a/webservices/wshostletconnection/group/senhostletconnection.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wshostletconnection/group/senhostletconnection.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -100,7 +100,7 @@
#endif
LANG SC
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../eabi/SENHOSTCONN.DEF
#elif defined(WINSCW)
DEFFILE ../BWINSCW/SENHOSTCONN.DEF
--- a/webservices/wsidentitymanager/group/senidentitymanager.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wsidentitymanager/group/senidentitymanager.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -87,7 +87,7 @@
#endif //WINSCW
#endif // __CRYPTO_HW__
/*
-#if defined(ARMCC)
+#if defined(EABI)
LIBRARY PLPVARIANT.LIB
#elif defined(WINSCW)
#elif defined(WINS)
@@ -113,7 +113,7 @@
LIBRARY wsUtils.lib
#endif
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../eabi/SENIDENTITYMANAGER.DEF
#elif defined(WINSCW)
DEFFILE ../BWINSCW/SENIDENTITYMANAGER.DEF
--- a/webservices/wslogger/group/senlogger.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wslogger/group/senlogger.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -67,7 +67,7 @@
LANG SC
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../eabi/SENLOGGER.DEF
#elif defined(WINSCW)
DEFFILE ../BWINSCW/SENLOGGER.DEF
--- a/webservices/wsmanager/group/senservicemanager.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wsmanager/group/senservicemanager.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -48,7 +48,7 @@
#endif
#endif
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../eabi/SENSERVMGR.DEF
#elif defined(WINSCW)
DEFFILE ../BWINSCW/SENSERVMGR.DEF
--- a/webservices/wsmessages/group/senmessages.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wsmessages/group/senmessages.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -104,7 +104,7 @@
LIBRARY estlib.lib // strlen
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../eabi/SenMessages.DEF
#elif defined(WINSCW)
DEFFILE ../BWINSCW/SenMessages.DEF
--- a/webservices/wsnotifierplugins/group/sennotifierplugin.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wsnotifierplugins/group/sennotifierplugin.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -143,7 +143,7 @@
#endif
#ifdef EKA2
- #if defined(ARMCC)
+ #if defined(EABI)
DEFFILE ../eabi/SENNOTIFIERPLUGIN.DEF
#elif defined(WINSCW)
DEFFILE ../BWINSCW/SENNOTIFIERPLUGIN.DEF
@@ -158,7 +158,7 @@
//#ifdef SYMBIAN_SECURE_ECOM
//#else // not SYMBIAN_SECURE_ECOM
-// #if defined(ARMCC)
+// #if defined(EABI)
// DEFFILE ../EABI/SENNOTIFIERPLUGIN_2.6.DEF
// #elif defined(WINSCW)
// DEFFILE ../BWINSCW/SENNOTIFIERPLUGIN_2.6.DEF
--- a/webservices/wsnotifierplugins/group/sennotplugindlgclient.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wsnotifierplugins/group/sennotplugindlgclient.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -57,7 +57,7 @@
LIBRARY euser.lib
#ifdef SYMBIAN_SECURE_ECOM
- #if defined(ARMCC)
+ #if defined(EABI)
DEFFILE ../eabi/SENNOTPLUGINDLGCLIENT.DEF
#elif defined(WINSCW)
DEFFILE ../BWINSCW/SENNOTPLUGINDLGCLIENT.DEF
@@ -67,7 +67,7 @@
DEFFILE ../BMARM/SENNOTPLUGINDLGCLIENT.DEF
#endif
#else // not SYMBIAN_SECURE_ECOM
- #if defined(ARMCC)
+ #if defined(EABI)
DEFFILE ../EABI/SENNOTPLUGINDLGCLIENT_2.6.DEF
#elif defined(WINSCW)
DEFFILE ../BWINSCW/SENNOTPLUGINDLGCLIENT_2.6.DEF
--- a/webservices/wsprovider/group/senprovider.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wsprovider/group/senprovider.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -47,7 +47,7 @@
#endif
#endif
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../eabi/SENPROVIDER.DEF
#elif defined(WINSCW)
DEFFILE ../BWINSCW/SENPROVIDER.DEF
--- a/webservices/wsstar/wsstarpolicy/group/wspolicy.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wsstar/wsstarpolicy/group/wspolicy.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -50,7 +50,7 @@
#endif
#endif
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../eabi/WsPolicy.def
#elif defined(WINSCW)
DEFFILE ../BWINSCW/WsPolicy.def
--- a/webservices/wsutils/group/senutils.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wsutils/group/senutils.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -101,7 +101,7 @@
LANG SC
-#if defined(ARMCC)
+#if defined(EABI)
#if defined (RD_SEN_COMPILE_SIS_PACKAGE_FILES)
DEFFILE ../EABI/SENUTILS_V2.DEF
#else
--- a/webservices/wsxml/group/senxml.mmp Tue Jul 06 15:29:11 2010 +0300
+++ b/webservices/wsxml/group/senxml.mmp Thu Jul 22 16:44:27 2010 +0100
@@ -79,7 +79,7 @@
LIBRARY efsrv.lib // fileserver
#endif // EKA2
-#if defined(ARMCC)
+#if defined(EABI)
DEFFILE ../eabi/SENXML.DEF
#elif defined(WINSCW)
DEFFILE ../BWINSCW/SENXML.DEF