# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279813107 -3600
# Node ID 0713fb089b10bcfb4c7af9ffce329b04320e96fa
# Parent  2af57effcf411c05d7e0ba933c07fc8ad05a3164# Parent  dd1f62411ef88df74a5b28d8e1dd10d465c1adf5
Catchup to latest Symbian^4

diff -r dd1f62411ef8 -r 0713fb089b10 applayerprotocols/httptransportfw/group/bld.inf
--- a/applayerprotocols/httptransportfw/group/bld.inf	Tue Jul 06 14:51:44 2010 +0300
+++ b/applayerprotocols/httptransportfw/group/bld.inf	Thu Jul 22 16:38:27 2010 +0100
@@ -89,9 +89,11 @@
 // rom definition file
 httpcore.iby	/epoc32/rom/include/httpcore.iby
 
+#if 0 // bug 2006
 // Export the help files
 "../documentation/HTTP Client Public API.chm"			"/epoc32/engdoc/application-protocols/httpclientpublicapi.chm"
 "../documentation/HTTP Client Internal Documentation.chm"	"/epoc32/engdoc/application-protocols/httpclientinternaldocumentation.chm"
+#endif
 
 PRJ_TESTEXPORTS
 // top-level WSP includes
diff -r dd1f62411ef8 -r 0713fb089b10 httpfilters/cookie/Group/CookieManager.mmp
--- a/httpfilters/cookie/Group/CookieManager.mmp	Tue Jul 06 14:51:44 2010 +0300
+++ b/httpfilters/cookie/Group/CookieManager.mmp	Thu Jul 22 16:38:27 2010 +0100
@@ -55,7 +55,7 @@
 LIBRARY		SysUtil.lib
 LIBRARY         XmlEngineDOM.lib
 
-#if defined(ARMCC)
+#if defined(EABI)
         DEFFILE ../EABI/COOKIEMANAGERU_EKA2.def
 #elif defined( WINSCW )
         DEFFILE ../BWinsCw/COOKIEMANAGERU_EKA2.def
diff -r dd1f62411ef8 -r 0713fb089b10 httpfilters/httpfiltercommon/group/HttpFilterCommon.mmp
--- a/httpfilters/httpfiltercommon/group/HttpFilterCommon.mmp	Tue Jul 06 14:51:44 2010 +0300
+++ b/httpfilters/httpfiltercommon/group/HttpFilterCommon.mmp	Thu Jul 22 16:38:27 2010 +0100
@@ -25,7 +25,7 @@
 CAPABILITY CAP_GENERAL_DLL
 VENDORID        VID_DEFAULT
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile EABI/HttpFilterCommon.def
 #elif defined( WINSCW )
 deffile BWINSCW/HTTPFILTERCOMMON.DEF