# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1280322893 -3600
# Node ID 43cdb2397a6198cba64eb6a209f37561d7eabce6
# Parent  7770e7c6cef315b692b9ffdaf7248288b187fbd1
Fix def file selection problems for GCCE builds - Bug 3431

diff -r 7770e7c6cef3 -r 43cdb2397a61 xml/cxmllibrary/group/cXmlParser.mmp
--- a/xml/cxmllibrary/group/cXmlParser.mmp	Thu Jul 22 16:49:54 2010 +0100
+++ b/xml/cxmllibrary/group/cXmlParser.mmp	Wed Jul 28 14:14:53 2010 +0100
@@ -21,8 +21,8 @@
 
 
 
-#if defined(ARMCC)
 UID	0x1000008D 	0x101F8710
+#if defined(EABI)
 deffile eabi/CXMLPARSER.DEF
 #elif defined( WINSCW )
 deffile BWINSCW/CXMLPARSER.DEF
diff -r 7770e7c6cef3 -r 43cdb2397a61 xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/group/xmlengtester.mmp
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/group/xmlengtester.mmp	Thu Jul 22 16:49:54 2010 +0100
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/group/xmlengtester.mmp	Wed Jul 28 14:14:53 2010 +0100
@@ -22,7 +22,7 @@
 TARGETTYPE      dll
 UID             0x1000008D 0x101F96E8
 
-#if defined(ARMCC)
+#if defined(EABI)
   DEFFILE	 ../eabi/xmlengtester.def
 #elif defined(WINSCW) || defined(WINS)
   DEFFILE    ../bwinscw/xmlengtester.def
diff -r 7770e7c6cef3 -r 43cdb2397a61 xml/libxml2libs/test/xmlengtester/xmlengtester_target/group/xmlengtester.mmp
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/group/xmlengtester.mmp	Thu Jul 22 16:49:54 2010 +0100
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/group/xmlengtester.mmp	Wed Jul 28 14:14:53 2010 +0100
@@ -19,7 +19,7 @@
 TARGETTYPE      dll
 UID             0x1000008D 0x101F96E8
 
-#if defined(ARMCC)
+#if defined(EABI)
   DEFFILE	 ../eabi/xmlengtester.def
 #elif defined(WINSCW) || defined(WINS)
   DEFFILE    ../bwinscw/xmlengtester.def
diff -r 7770e7c6cef3 -r 43cdb2397a61 xml/xmlparser/group/XMLInterface.mmp
--- a/xml/xmlparser/group/XMLInterface.mmp	Thu Jul 22 16:49:54 2010 +0100
+++ b/xml/xmlparser/group/XMLInterface.mmp	Wed Jul 28 14:14:53 2010 +0100
@@ -25,7 +25,7 @@
 
 VENDORID VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE ../eabi/xmlinterface.def
 #elif defined(WINSCW)
 DEFFILE ../bwinscw/xmlinterface.def
diff -r 7770e7c6cef3 -r 43cdb2397a61 xmlsecurityengine/xmlsec/group/xmlsec.mmp
--- a/xmlsecurityengine/xmlsec/group/xmlsec.mmp	Thu Jul 22 16:49:54 2010 +0100
+++ b/xmlsecurityengine/xmlsec/group/xmlsec.mmp	Wed Jul 28 14:14:53 2010 +0100
@@ -71,7 +71,7 @@
 nostrictdef
 epocallowdlldata
 
-#if defined(ARMCC)
+#if defined(EABI)
 #if !defined(__RD_XMLSEC_MEMCOPY_PROBLEM_FIX__)
   DEFFILE ../eabi/xmlsec.def
 #else
diff -r 7770e7c6cef3 -r 43cdb2397a61 xmlsecurityengine/xmlseccertman/group/xmlseccertman.mmp
--- a/xmlsecurityengine/xmlseccertman/group/xmlseccertman.mmp	Thu Jul 22 16:49:54 2010 +0100
+++ b/xmlsecurityengine/xmlseccertman/group/xmlseccertman.mmp	Wed Jul 28 14:14:53 2010 +0100
@@ -45,7 +45,7 @@
 
 nostrictdef
 
-#if defined(ARMCC)
+#if defined(EABI)
 #if !defined(__RD_XMLSEC_MEMCOPY_PROBLEM_FIX__)
   DEFFILE ../eabi/xmlseccertman.def
 #else
diff -r 7770e7c6cef3 -r 43cdb2397a61 xmlsecurityengine/xmlseccrypto/group/xmlseccrypto.mmp
--- a/xmlsecurityengine/xmlseccrypto/group/xmlseccrypto.mmp	Thu Jul 22 16:49:54 2010 +0100
+++ b/xmlsecurityengine/xmlseccrypto/group/xmlseccrypto.mmp	Wed Jul 28 14:14:53 2010 +0100
@@ -64,7 +64,7 @@
 nostrictdef
 EPOCALLOWDLLDATA
 
-#if defined(ARMCC)
+#if defined(EABI)
 #if !defined(__RD_XMLSEC_MEMCOPY_PROBLEM_FIX__)
   DEFFILE ../eabi/xmlseccrypto.def
 #else
diff -r 7770e7c6cef3 -r 43cdb2397a61 xmlsecurityengine/xmlsecwrapper/group/xmlsecwrapper.mmp
--- a/xmlsecurityengine/xmlsecwrapper/group/xmlsecwrapper.mmp	Thu Jul 22 16:49:54 2010 +0100
+++ b/xmlsecurityengine/xmlsecwrapper/group/xmlsecwrapper.mmp	Wed Jul 28 14:14:53 2010 +0100
@@ -66,7 +66,7 @@
 LIBRARY         xmlsec.lib
 LIBRARY         xmlseccrypto.lib
 
-#if defined(ARMCC)
+#if defined(EABI)
 #if !defined(__RD_XMLSEC_MEMCOPY_PROBLEM_FIX__)
   DEFFILE ../eabi/xmlsecwrapper.def
 #else
diff -r 7770e7c6cef3 -r 43cdb2397a61 xmlsrv_plat/xml_encryption_api/tsrc/group/test_xmlsecencrypt.mmp
--- a/xmlsrv_plat/xml_encryption_api/tsrc/group/test_xmlsecencrypt.mmp	Thu Jul 22 16:49:54 2010 +0100
+++ b/xmlsrv_plat/xml_encryption_api/tsrc/group/test_xmlsecencrypt.mmp	Wed Jul 28 14:14:53 2010 +0100
@@ -22,7 +22,7 @@
 //TARGETPATH      /z/sys/bin
 UID             0x1000af5a 0x01700000
 
-#if defined(ARMCC)
+#if defined(EABI)
   DEFFILE ../eabi/test_xmlsecencrypt.def
 #elif defined(WINSCW) || defined(WINS)
   DEFFILE ../bwinscw/test_xmlsecencrypt.def
diff -r 7770e7c6cef3 -r 43cdb2397a61 xmlsrv_plat/xml_security_engine_utils_api/tsrc/group/test_xmlsecutils.mmp
--- a/xmlsrv_plat/xml_security_engine_utils_api/tsrc/group/test_xmlsecutils.mmp	Thu Jul 22 16:49:54 2010 +0100
+++ b/xmlsrv_plat/xml_security_engine_utils_api/tsrc/group/test_xmlsecutils.mmp	Wed Jul 28 14:14:53 2010 +0100
@@ -23,7 +23,7 @@
 //TARGETPATH      /z/sys/bin
 UID             0x1000af5a 0x01700000
 
-#if defined(ARMCC)
+#if defined(EABI)
   DEFFILE ../eabi/test_xmlsecutils.def
 #elif defined(WINSCW) || defined(WINS)
 DEFFILE ../bwinscw/test_xmlsecutils.def
diff -r 7770e7c6cef3 -r 43cdb2397a61 xmlsrv_plat/xml_signature_api/tsrc/group/test_xmlsecsign.mmp
--- a/xmlsrv_plat/xml_signature_api/tsrc/group/test_xmlsecsign.mmp	Thu Jul 22 16:49:54 2010 +0100
+++ b/xmlsrv_plat/xml_signature_api/tsrc/group/test_xmlsecsign.mmp	Wed Jul 28 14:14:53 2010 +0100
@@ -22,7 +22,7 @@
 //TARGETPATH      /z/sys/bin
 UID             0x1000af5a 0x01700000
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE ../eabi/test_xmlsecsign.def
 #elif defined(WINSCW) || defined(WINS)
 DEFFILE ../bwinscw/test_xmlsecsign.def