# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279813408 -3600
# Node ID 604cd42065d1abd07aad5b951d9425cf06b9fa25
# Parent  b63e8c2d8cff20785cbd08a5a7ca857ea9d0e5bc# Parent  e0432375ea670f07c0e03ce20a92b0d51f8eb85f
Catchup to latest Symbian^4

diff -r e0432375ea67 -r 604cd42065d1 pkiutilities/CTSecurityDialogs/Group/CTSecDialogImpl.mmp
--- a/pkiutilities/CTSecurityDialogs/Group/CTSecDialogImpl.mmp	Tue Jul 06 15:15:05 2010 +0300
+++ b/pkiutilities/CTSecurityDialogs/Group/CTSecDialogImpl.mmp	Thu Jul 22 16:43:28 2010 +0100
@@ -97,7 +97,7 @@
 
 DEBUGLIBRARY     flogger.lib
 
-#if defined(ARMCC)
+#if defined(EABI)
     DEFFILE ../eabi/CTSecDilogImpl.DEF
 #elif defined( WINSCW )
     DEFFILE ../BWINSCW/CTSecDilogImpl.DEF
diff -r e0432375ea67 -r 604cd42065d1 pkiutilities/CTSecurityDialogs/Group/CTSecDlgs.mmp
--- a/pkiutilities/CTSecurityDialogs/Group/CTSecDlgs.mmp	Tue Jul 06 15:15:05 2010 +0300
+++ b/pkiutilities/CTSecurityDialogs/Group/CTSecDlgs.mmp	Thu Jul 22 16:43:28 2010 +0100
@@ -39,7 +39,7 @@
 LIBRARY		estor.lib 
 LIBRARY     ctframework.lib
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/ 
 #elif defined( WINSCW )
 deffile ../BWINSCW/ 
diff -r e0432375ea67 -r 604cd42065d1 pkiutilities/PKCS12/CrBer/group/crber.mmp
--- a/pkiutilities/PKCS12/CrBer/group/crber.mmp	Tue Jul 06 15:15:05 2010 +0300
+++ b/pkiutilities/PKCS12/CrBer/group/crber.mmp	Thu Jul 22 16:43:28 2010 +0100
@@ -38,7 +38,7 @@
 CAPABILITY	  CAP_GENERAL_DLL
 VENDORID    	VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/ 
 #elif defined( WINSCW )
 deffile ../bwinscw/ 
diff -r e0432375ea67 -r 604cd42065d1 pkiutilities/PKCS12/CrPkcs12/group/crpkcs12.mmp
--- a/pkiutilities/PKCS12/CrPkcs12/group/crpkcs12.mmp	Tue Jul 06 15:15:05 2010 +0300
+++ b/pkiutilities/PKCS12/CrPkcs12/group/crpkcs12.mmp	Thu Jul 22 16:43:28 2010 +0100
@@ -42,7 +42,7 @@
 CAPABILITY  CAP_GENERAL_DLL
 VENDORID    VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/ 
 #else
 deffile ../bwinscw/ 
diff -r e0432375ea67 -r 604cd42065d1 pkiutilities/x509certnameparser/group/X509CertNameParser.mmp
--- a/pkiutilities/x509certnameparser/group/X509CertNameParser.mmp	Tue Jul 06 15:15:05 2010 +0300
+++ b/pkiutilities/x509certnameparser/group/X509CertNameParser.mmp	Thu Jul 22 16:43:28 2010 +0100
@@ -39,7 +39,7 @@
 CAPABILITY		CAP_GENERAL_DLL
 VENDORID        VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../EABI/ 
 #elif defined( WINSCW )
 deffile ../BWINSCW/