# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279812950 -3600
# Node ID 442486f870da77422101cb14eb2084f178b2df0c
# Parent  abec8b1bb37cdaaf1f4f83eb078814ebd9896c40# Parent  e824080bd1195c389e3e13cca948519d819b06d4
Catchup to latest Symbian^4

diff -r e824080bd119 -r 442486f870da commondrm/drmutility/group/DRMAutomatedUsage.mmp
--- a/commondrm/drmutility/group/DRMAutomatedUsage.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/commondrm/drmutility/group/DRMAutomatedUsage.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -49,7 +49,7 @@
 
 DOCUMENT    bld.inf
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/
 #elif defined( WINSCW )
 deffile ../bwinscw/
diff -r e824080bd119 -r 442486f870da commondrm/drmutility/group/DRMAutomatedUsageImpl.mmp
--- a/commondrm/drmutility/group/DRMAutomatedUsageImpl.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/commondrm/drmutility/group/DRMAutomatedUsageImpl.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -53,7 +53,7 @@
 
 DOCUMENT    bld.inf
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/
 #elif defined( WINSCW )
 deffile ../bwinscw/
diff -r e824080bd119 -r 442486f870da commondrm/drmutility/group/DRMUiHandling.mmp
--- a/commondrm/drmutility/group/DRMUiHandling.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/commondrm/drmutility/group/DRMUiHandling.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -49,7 +49,7 @@
 
 DOCUMENT    bld.inf
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/
 #elif defined( WINSCW )
 deffile ../bwinscw/
diff -r e824080bd119 -r 442486f870da commondrm/drmutility/group/DRMUtility.mmp
--- a/commondrm/drmutility/group/DRMUtility.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/commondrm/drmutility/group/DRMUtility.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -44,7 +44,7 @@
 
 DOCUMENT    bld.inf
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/
 #elif defined( WINSCW )
 deffile ../bwinscw/
diff -r e824080bd119 -r 442486f870da commondrm/drmutility/group/DrmRightsInfo.mmp
--- a/commondrm/drmutility/group/DrmRightsInfo.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/commondrm/drmutility/group/DrmRightsInfo.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -49,7 +49,7 @@
 
 DOCUMENT    bld.inf
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/
 #elif defined( WINSCW )
 deffile ../bwinscw/
diff -r e824080bd119 -r 442486f870da commondrm/drmutility/group/DrmRightsInfoImpl.mmp
--- a/commondrm/drmutility/group/DrmRightsInfoImpl.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/commondrm/drmutility/group/DrmRightsInfoImpl.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -47,7 +47,7 @@
 
 DOCUMENT    bld.inf
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/ 
 #elif defined( WINSCW )
 deffile ../bwinscw/ 
diff -r e824080bd119 -r 442486f870da commondrm/drmutility/group/DrmUtilityDmgrWrapper.mmp
--- a/commondrm/drmutility/group/DrmUtilityDmgrWrapper.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/commondrm/drmutility/group/DrmUtilityDmgrWrapper.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -64,7 +64,7 @@
 START MARM
 END
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/
 #elif defined( WINSCW )
 deffile ../bwinscw/
diff -r e824080bd119 -r 442486f870da commondrm/drmutility/group/drmutilitycommon.mmp
--- a/commondrm/drmutility/group/drmutilitycommon.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/commondrm/drmutility/group/drmutilitycommon.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -66,7 +66,7 @@
 
 DOCUMENT    bld.inf
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/
 #elif defined( WINSCW )
 deffile ../bwinscw/
diff -r e824080bd119 -r 442486f870da commondrm/drmutility/group/drmutilitywmdrmwrapper.mmp
--- a/commondrm/drmutility/group/drmutilitywmdrmwrapper.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/commondrm/drmutility/group/drmutilitywmdrmwrapper.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -55,7 +55,7 @@
 
 DOCUMENT    bld.inf
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/
 #elif defined( WINSCW )
 deffile ../bwinscw/
diff -r e824080bd119 -r 442486f870da commondrm/drmutility/inc/drmautomatedusageerrorhandling.h
--- a/commondrm/drmutility/inc/drmautomatedusageerrorhandling.h	Tue Jul 13 16:26:49 2010 +0100
+++ b/commondrm/drmutility/inc/drmautomatedusageerrorhandling.h	Thu Jul 22 16:35: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,
diff -r e824080bd119 -r 442486f870da commondrm/drmutility/inc/drmuierrorhandling.h
--- a/commondrm/drmutility/inc/drmuierrorhandling.h	Tue Jul 13 16:26:49 2010 +0100
+++ b/commondrm/drmutility/inc/drmuierrorhandling.h	Thu Jul 22 16:35: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, 
diff -r e824080bd119 -r 442486f870da drm_plat/drm_common_api/tsrc/data/mmc/DRM/content.dcf
diff -r e824080bd119 -r 442486f870da drm_plat/drm_rights_api/tsrc/data/c/content.dcf
diff -r e824080bd119 -r 442486f870da drm_pub/oma_drm_caf_agent_api/tsrc/bc/DRM_CAF/data/content.dcf
diff -r e824080bd119 -r 442486f870da omadrm/drmengine/group/DRMCommon.mmp
--- a/omadrm/drmengine/group/DRMCommon.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/omadrm/drmengine/group/DRMCommon.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -60,7 +60,7 @@
 LIBRARY         platformenv.lib
 #endif
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/ 
 #elif defined( WINSCW )
 deffile ../bwinscw/ 
diff -r e824080bd119 -r 442486f870da omadrm/drmengine/group/DcfRep.mmp
--- a/omadrm/drmengine/group/DcfRep.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/omadrm/drmengine/group/DcfRep.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -51,7 +51,7 @@
 
 
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/ 
 #elif defined( WINSCW )
 deffile ../bwinscw/ 
diff -r e824080bd119 -r 442486f870da omadrm/drmengine/group/DrmCrypto.mmp
--- a/omadrm/drmengine/group/DrmCrypto.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/omadrm/drmengine/group/DrmCrypto.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -55,7 +55,7 @@
 LIBRARY         flogger.lib
 LIBRARY         DrmKeyStorage.lib
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/
 #elif defined( WINSCW )
 deffile ../bwinscw/
diff -r e824080bd119 -r 442486f870da omadrm/drmengine/group/DrmDcf.mmp
--- a/omadrm/drmengine/group/DrmDcf.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/omadrm/drmengine/group/DrmDcf.mmp	Thu Jul 22 16:35: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/ 
diff -r e824080bd119 -r 442486f870da omadrm/drmengine/group/DrmKeyStorage.mmp
--- a/omadrm/drmengine/group/DrmKeyStorage.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/omadrm/drmengine/group/DrmKeyStorage.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -47,7 +47,7 @@
 LIBRARY         hash.lib
 LIBRARY         flogger.lib
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/ 
 #elif defined( WINSCW )
 deffile ../bwinscw/ 
diff -r e824080bd119 -r 442486f870da omadrm/drmengine/group/DrmParsers.mmp
--- a/omadrm/drmengine/group/DrmParsers.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/omadrm/drmengine/group/DrmParsers.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -62,7 +62,7 @@
 
 LIBRARY    flogger.lib
 
-#if defined( ARMCC )
+#if defined( EABI )
 deffile ../eabi/
 #elif defined( WINSCW )
 deffile ../bwinscw/
diff -r e824080bd119 -r 442486f870da omadrm/drmengine/group/DrmRights.mmp
--- a/omadrm/drmengine/group/DrmRights.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/omadrm/drmengine/group/DrmRights.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -51,7 +51,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/ 
diff -r e824080bd119 -r 442486f870da omadrm/drmengine/group/DrmServerInterfaces.mmp
--- a/omadrm/drmengine/group/DrmServerInterfaces.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/omadrm/drmengine/group/DrmServerInterfaces.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -74,7 +74,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/ 
diff -r e824080bd119 -r 442486f870da omadrm/drmengine/group/DrmServiceAPI.mmp
--- a/omadrm/drmengine/group/DrmServiceAPI.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/omadrm/drmengine/group/DrmServiceAPI.mmp	Thu Jul 22 16:35: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/ 
diff -r e824080bd119 -r 442486f870da omadrm/drmengine/group/DrmStdKeyStorage.mmp
--- a/omadrm/drmengine/group/DrmStdKeyStorage.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/omadrm/drmengine/group/DrmStdKeyStorage.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -52,7 +52,7 @@
 LIBRARY       platformenv.lib
 #endif
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/ 
 #elif defined( WINSCW )
 deffile ../bwinscw/ 
diff -r e824080bd119 -r 442486f870da omadrm/drmengine/group/ROAPHandler.mmp
--- a/omadrm/drmengine/group/ROAPHandler.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/omadrm/drmengine/group/ROAPHandler.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -126,7 +126,7 @@
 macro      _ROAP_TESTING
 LIBRARY    flogger.lib
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/
 #elif defined( WINSCW )
 deffile ../bwinscw/
diff -r e824080bd119 -r 442486f870da omadrm/drmhelper/drmhelperserver/group/DRMHelperServer.mmp
--- a/omadrm/drmhelper/drmhelperserver/group/DRMHelperServer.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/omadrm/drmhelper/drmhelperserver/group/DRMHelperServer.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -57,7 +57,7 @@
 LIBRARY       platformenv.lib
 #endif
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/ 
 #elif defined( WINSCW )
 deffile ../bwinscw/ 
diff -r e824080bd119 -r 442486f870da omadrm/drmlicensemanager/group/DRMLicenseChecker.mmp
--- a/omadrm/drmlicensemanager/group/DRMLicenseChecker.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/omadrm/drmlicensemanager/group/DRMLicenseChecker.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -44,7 +44,7 @@
 LIBRARY         DrmServerInterfaces.lib
 LIBRARY         DRMCommon.lib
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/
 #elif defined( WINSCW )
 deffile ../BWINSCW/
diff -r e824080bd119 -r 442486f870da omadrm/drmlicensemanager/group/DRMLicenseManager.mmp
--- a/omadrm/drmlicensemanager/group/DRMLicenseManager.mmp	Tue Jul 13 16:26:49 2010 +0100
+++ b/omadrm/drmlicensemanager/group/DRMLicenseManager.mmp	Thu Jul 22 16:35:50 2010 +0100
@@ -48,7 +48,7 @@
 LIBRARY         sysutil.lib // SysUtil
 
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/
 #elif defined( WINSCW )
 deffile ../BWINSCW/