--- a/commondrm/drmutility/group/DRMAutomatedUsage.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/commondrm/drmutility/group/DRMAutomatedUsage.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -49,7 +49,7 @@
DOCUMENT bld.inf
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/commondrm/drmutility/group/DRMAutomatedUsageImpl.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/commondrm/drmutility/group/DRMAutomatedUsageImpl.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -53,7 +53,7 @@
DOCUMENT bld.inf
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/commondrm/drmutility/group/DRMUiHandling.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/commondrm/drmutility/group/DRMUiHandling.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -49,7 +49,7 @@
DOCUMENT bld.inf
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/commondrm/drmutility/group/DRMUiHandlingImpl.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/commondrm/drmutility/group/DRMUiHandlingImpl.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -69,7 +69,7 @@
DOCUMENT bld.inf
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/commondrm/drmutility/group/DRMUtility.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/commondrm/drmutility/group/DRMUtility.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -44,7 +44,7 @@
DOCUMENT bld.inf
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/commondrm/drmutility/group/DrmRightsInfo.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/commondrm/drmutility/group/DrmRightsInfo.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -49,7 +49,7 @@
DOCUMENT bld.inf
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/commondrm/drmutility/group/DrmRightsInfoImpl.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/commondrm/drmutility/group/DrmRightsInfoImpl.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -47,7 +47,7 @@
DOCUMENT bld.inf
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/commondrm/drmutility/group/DrmUtilityDmgrWrapper.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/commondrm/drmutility/group/DrmUtilityDmgrWrapper.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -64,7 +64,7 @@
START MARM
END
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/commondrm/drmutility/group/drmutilitycommon.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/commondrm/drmutility/group/drmutilitycommon.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -64,7 +64,7 @@
DOCUMENT bld.inf
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/commondrm/drmutility/group/drmutilitywmdrmwrapper.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/commondrm/drmutility/group/drmutilitywmdrmwrapper.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -55,7 +55,7 @@
DOCUMENT bld.inf
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/commondrm/drmutility/inc/drmautomatedusageerrorhandling.h Fri Jun 11 16:24:53 2010 +0100
+++ b/commondrm/drmutility/inc/drmautomatedusageerrorhandling.h Wed Jun 16 17:39:50 2010 +0100
@@ -108,7 +108,7 @@
* @see ContentAccess::TIntent
* @see MDrmErrorHandling
*/
- virtual TInt HandleErrorAsyncL(
+ IMPORT_C virtual TInt HandleErrorAsyncL(
RFile& aFile,
ContentAccess::TIntent aIntent,
TInt aError,
@@ -135,7 +135,7 @@
* @see ContentAccess::TIntent
* @see MDrmErrorHandling
*/
- virtual void HandleErrorL(
+ IMPORT_C virtual void HandleErrorL(
RFile& aFile,
ContentAccess::TIntent aIntent,
TInt aError,
@@ -164,7 +164,7 @@
* @see ContentAccess::TIntent
* @see MDrmErrorHandling
*/
- virtual TInt HandleErrorAsyncL(
+ IMPORT_C virtual TInt HandleErrorAsyncL(
ContentAccess::CData& aFile,
ContentAccess::TIntent aIntent,
TInt aError,
@@ -191,7 +191,7 @@
* @see ContentAccess::TIntent
* @see MDrmErrorHandling
*/
- virtual void HandleErrorL(
+ IMPORT_C virtual void HandleErrorL(
ContentAccess::CData& aFile,
ContentAccess::TIntent aIntent,
TInt aError,
--- a/commondrm/drmutility/inc/drmuierrorhandling.h Fri Jun 11 16:24:53 2010 +0100
+++ b/commondrm/drmutility/inc/drmuierrorhandling.h Wed Jun 16 17:39:50 2010 +0100
@@ -87,7 +87,7 @@
* @see MDrmHandleErrorObserver
* @see ContentAccess::TIntent
*/
- virtual TInt HandleErrorAsyncL(
+ IMPORT_C virtual TInt HandleErrorAsyncL(
RFile& aFile,
ContentAccess::TIntent aIntent,
TInt aError,
@@ -113,7 +113,7 @@
* @see MDrmHandleErrorObserver
* @see ContentAccess::TIntent
*/
- virtual void HandleErrorL(
+ IMPORT_C virtual void HandleErrorL(
RFile& aFile,
ContentAccess::TIntent aIntent,
TInt aError,
@@ -141,7 +141,7 @@
* @see MDrmHandleErrorObserver
* @see ContentAccess::TIntent
*/
- virtual TInt HandleErrorAsyncL(
+ IMPORT_C virtual TInt HandleErrorAsyncL(
ContentAccess::CData& aFile,
ContentAccess::TIntent aIntent,
TInt aError,
@@ -167,7 +167,7 @@
* @see MDrmHandleErrorObserver
* @see ContentAccess::TIntent
*/
- virtual void HandleErrorL(
+ IMPORT_C virtual void HandleErrorL(
ContentAccess::CData& aFile,
ContentAccess::TIntent aIntent,
TInt aError,
--- a/omadrm/drmengine/group/DRMCommon.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/omadrm/drmengine/group/DRMCommon.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -61,7 +61,7 @@
LIBRARY platformenv.lib
#endif
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/omadrm/drmengine/group/DcfRep.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/omadrm/drmengine/group/DcfRep.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -51,7 +51,7 @@
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/omadrm/drmengine/group/DrmCrypto.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/omadrm/drmengine/group/DrmCrypto.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -57,7 +57,7 @@
LIBRARY flogger.lib
LIBRARY DrmKeyStorage.lib
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/omadrm/drmengine/group/DrmDcf.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/omadrm/drmengine/group/DrmDcf.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -51,7 +51,7 @@
LIBRARY cryptography.lib random.lib bafl.lib charconv.lib
LIBRARY centralrepository.lib
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/omadrm/drmengine/group/DrmKeyStorage.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/omadrm/drmengine/group/DrmKeyStorage.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -48,7 +48,7 @@
LIBRARY hash.lib
LIBRARY flogger.lib
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/omadrm/drmengine/group/DrmParsers.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/omadrm/drmengine/group/DrmParsers.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -64,7 +64,7 @@
LIBRARY flogger.lib
-#if defined( ARMCC )
+#if defined( EABI )
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/omadrm/drmengine/group/DrmRights.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/omadrm/drmengine/group/DrmRights.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -53,7 +53,7 @@
LIBRARY estor.lib efsrv.lib apmime.lib InetProtUtil.lib bnf.lib
LIBRARY cryptography.lib random.lib bafl.lib charconv.lib
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/omadrm/drmengine/group/DrmServerInterfaces.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/omadrm/drmengine/group/DrmServerInterfaces.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -77,7 +77,7 @@
LIBRARY estor.lib efsrv.lib apmime.lib InetProtUtil.lib bnf.lib
LIBRARY cryptography.lib random.lib bafl.lib charconv.lib
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/omadrm/drmengine/group/DrmServiceAPI.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/omadrm/drmengine/group/DrmServiceAPI.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -35,7 +35,7 @@
LIBRARY drmserverinterfaces.lib
LIBRARY euser.lib
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/omadrm/drmengine/group/DrmStdKeyStorage.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/omadrm/drmengine/group/DrmStdKeyStorage.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -54,7 +54,7 @@
LIBRARY platformenv.lib
#endif
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/omadrm/drmengine/group/ROAPHandler.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/omadrm/drmengine/group/ROAPHandler.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -128,7 +128,7 @@
macro _ROAP_TESTING
LIBRARY flogger.lib
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/omadrm/drmhelper/drmhelperserver/group/DRMHelperServer.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/omadrm/drmhelper/drmhelperserver/group/DRMHelperServer.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -57,7 +57,7 @@
LIBRARY platformenv.lib
#endif
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../bwinscw/
--- a/omadrm/drmhelper/group/Drmhelper.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/omadrm/drmhelper/group/Drmhelper.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -99,7 +99,7 @@
#endif
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../EABI/
#elif defined( WINSCW )
deffile ../BWINSCW/
--- a/omadrm/drmlicensemanager/group/DRMLicenseChecker.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/omadrm/drmlicensemanager/group/DRMLicenseChecker.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -45,7 +45,7 @@
LIBRARY DrmServerInterfaces.lib
LIBRARY DRMCommon.lib
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../BWINSCW/
--- a/omadrm/drmlicensemanager/group/DRMLicenseManager.mmp Fri Jun 11 16:24:53 2010 +0100
+++ b/omadrm/drmlicensemanager/group/DRMLicenseManager.mmp Wed Jun 16 17:39:50 2010 +0100
@@ -49,7 +49,7 @@
LIBRARY sysutil.lib // SysUtil
-#if defined(ARMCC)
+#if defined(EABI)
deffile ../eabi/
#elif defined( WINSCW )
deffile ../BWINSCW/