# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1273847078 -10800
# Node ID e8d041006974ade9b58c10cf1b0dbe88b3f38af7
# Parent  39bb7c3571e909dc598fd2de19ad9e4891de18af
Revision: 201019
Kit: 201019

diff -r 39bb7c3571e9 -r e8d041006974 linklayercontrol/networkinterfacemgr/group/agentpr.mmp
--- a/linklayercontrol/networkinterfacemgr/group/agentpr.mmp	Mon May 03 13:58:16 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/group/agentpr.mmp	Fri May 14 17:24:38 2010 +0300
@@ -44,7 +44,6 @@
 
 USERINCLUDE                ../agentpr/inc
 USERINCLUDE                ../agentprcore/inc
-USERINCLUDE                ../../../../commsfw/datacommsserver/esockserver/inc
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
diff -r 39bb7c3571e9 -r e8d041006974 linklayercontrol/networkinterfacemgr/group/agentprcore.mmp
--- a/linklayercontrol/networkinterfacemgr/group/agentprcore.mmp	Mon May 03 13:58:16 2010 +0300
+++ b/linklayercontrol/networkinterfacemgr/group/agentprcore.mmp	Fri May 14 17:24:38 2010 +0300
@@ -47,8 +47,6 @@
 
 USERINCLUDE                 ../inc
 USERINCLUDE                 ../agentprcore/inc
-USERINCLUDE                 ../../../../commsfw/datacommsserver/esockserver/inc
-
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
diff -r 39bb7c3571e9 -r e8d041006974 networkprotocols/ipeventnotifier/IPEventFactory/group/IPEventFactory.iby
--- a/networkprotocols/ipeventnotifier/IPEventFactory/group/IPEventFactory.iby	Mon May 03 13:58:16 2010 +0300
+++ b/networkprotocols/ipeventnotifier/IPEventFactory/group/IPEventFactory.iby	Fri May 14 17:24:38 2010 +0300
@@ -18,7 +18,7 @@
 #ifndef __IP_EVENT_FACTORY_IBY__
 #define __IP_EVENT_FACTORY_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_DHCP
+#ifndef __DHCP
 REM Feature DHCP is not included in this ROM
 #else
 ECOM_PLUGIN(IPEventFactory.dll,1020469F.rsc)
diff -r 39bb7c3571e9 -r e8d041006974 networkprotocols/ipeventnotifier/IPEventTypes/group/IPEventTypes.iby
--- a/networkprotocols/ipeventnotifier/IPEventTypes/group/IPEventTypes.iby	Mon May 03 13:58:16 2010 +0300
+++ b/networkprotocols/ipeventnotifier/IPEventTypes/group/IPEventTypes.iby	Fri May 14 17:24:38 2010 +0300
@@ -20,7 +20,7 @@
 #ifndef __IP_EVENT_TYPES_IBY__
 #define __IP_EVENT_TYPES_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_DHCP
+#ifndef __DHCP
 REM Feature DHCP is not included in this ROM
 #else
 
diff -r 39bb7c3571e9 -r e8d041006974 networkprotocols/ipeventnotifier/group/ipeventnotifier.iby
--- a/networkprotocols/ipeventnotifier/group/ipeventnotifier.iby	Mon May 03 13:58:16 2010 +0300
+++ b/networkprotocols/ipeventnotifier/group/ipeventnotifier.iby	Fri May 14 17:24:38 2010 +0300
@@ -22,7 +22,7 @@
 #define __IPEVENTNOTIFIER_IBY__
 
 
-#ifdef SYMBIAN_EXCLUDE_DHCP
+#ifndef __DHCP
 REM Feature DHCP is not included in this ROM
 #else
 
diff -r 39bb7c3571e9 -r e8d041006974 networksecurity/ipsec/group/ipsec.iby
--- a/networksecurity/ipsec/group/ipsec.iby	Mon May 03 13:58:16 2010 +0300
+++ b/networksecurity/ipsec/group/ipsec.iby	Fri May 14 17:24:38 2010 +0300
@@ -30,7 +30,7 @@
 REM IPSEC protocol and other core components
 
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifndef __IPSEC
 
 	REM Feature IPSEC not included in this rom
 
@@ -42,6 +42,6 @@
 	file=ABI_DIR\DEBUG_DIR\lib_pfkey.dll		System\Libs\lib_pfkey.dll
 	#include <ipseccrypto.iby>
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // __IPSEC
 
 #endif // __IPSEC_IBY__
diff -r 39bb7c3571e9 -r e8d041006974 networksecurity/ipsec/ipsec6/group/ipsec6.iby
--- a/networksecurity/ipsec/ipsec6/group/ipsec6.iby	Mon May 03 13:58:16 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/group/ipsec6.iby	Fri May 14 17:24:38 2010 +0300
@@ -28,7 +28,7 @@
 #include <inhook6.iby>
 #include <nifman.iby>
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifndef __IPSEC
 
 REM Feature IPSEC not included in this rom
 
@@ -43,6 +43,6 @@
 
 file=ABI_DIR\DEBUG_DIR\ipsec6.prt            system\libs\ipsec6.prt
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // __IPSEC
 
 #endif // __IPSEC6_IBY__
diff -r 39bb7c3571e9 -r e8d041006974 networksecurity/ipsec/ipsec6/include/crypto.h
--- a/networksecurity/ipsec/ipsec6/include/crypto.h	Mon May 03 13:58:16 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/include/crypto.h	Fri May 14 17:24:38 2010 +0300
@@ -84,9 +84,9 @@
 #include <e32base.h>
 #include <es_prot.h>
 
-#include "cryptospidef.h"
+#include <cryptospi/cryptospidef.h>
 #include "cryptosymmetriccipherapi.h"
-#include "cryptomacapi.h"
+#include <cryptospi/cryptomacapi.h>
 
 /**
 // The protocol number for a library.
diff -r 39bb7c3571e9 -r e8d041006974 networksecurity/ipsec/ipsec6/src/sa_crypt.cpp
--- a/networksecurity/ipsec/ipsec6/src/sa_crypt.cpp	Mon May 03 13:58:16 2010 +0300
+++ b/networksecurity/ipsec/ipsec6/src/sa_crypt.cpp	Fri May 14 17:24:38 2010 +0300
@@ -27,9 +27,9 @@
 #include <networking/ipsecerr.h>
 #include "ipseccrypto.h"
 #include "keys.h"
-#include "cryptospidef.h"
+#include <cryptospi/cryptospidef.h>
 #ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
-#include "cryptomacapi.h"
+#include <cryptospi/cryptomacapi.h>
 #endif //SYMBIAN_IPSEC_VOIP_SUPPORT
 
 class TLibraryPtr
diff -r 39bb7c3571e9 -r e8d041006974 networksecurity/ipsec/ipsec_itest/group/ts_ipsec.iby
--- a/networksecurity/ipsec/ipsec_itest/group/ts_ipsec.iby	Mon May 03 13:58:16 2010 +0300
+++ b/networksecurity/ipsec/ipsec_itest/group/ts_ipsec.iby	Fri May 14 17:24:38 2010 +0300
@@ -37,7 +37,7 @@
 data=EPOCROOT##epoc32\data\Z\TestData\configs\ts_ipsec_mh3.ini    testdata\configs\ts_ipsec_mh3.ini
 data=EPOCROOT##epoc32\data\Z\TestData\configs\ts_ipsec_mh4.ini    testdata\configs\ts_ipsec_mh4.ini
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifndef __IPSEC
 REM Feature IPSEC not included in this rom
 data=EPOCROOT##epoc32\data\Z\TestData\scripts\ts_ipsec_removed.script testdata\scripts\ts_ipsec_removed.script
 #else
@@ -84,7 +84,7 @@
 REM file=ABI_DIR\DEBUG_DIR\FAKE_IPSECNOTIF.DLL		System\TNotifiers\FAKE_IPSECNOTIF.DLL
 #endif 
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifndef __IPSEC
 REM Feature IPSEC not included in this rom so below apis added for tests to link
 file=ABI_DIR\DEBUG_DIR\ipsecpolapi.dll		System\Libs\ipsecpolapi.dll
 file=ABI_DIR\DEBUG_DIR\vpnapi.dll			SYSTEM_BINDIR\vpnapi.dll
diff -r 39bb7c3571e9 -r e8d041006974 networksecurity/ipsec/ipseccrypto/group/ipseccrypto.iby
--- a/networksecurity/ipsec/ipseccrypto/group/ipseccrypto.iby	Mon May 03 13:58:16 2010 +0300
+++ b/networksecurity/ipsec/ipseccrypto/group/ipseccrypto.iby	Fri May 14 17:24:38 2010 +0300
@@ -23,7 +23,7 @@
 #ifndef __IPSECCRYPTO_IBY__
 #define __IPSECCRYPTO_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifndef __IPSEC
 
 REM Feature IPSEC not included in this rom
 
@@ -31,6 +31,6 @@
 
 file=ABI_DIR\DEBUG_DIR\ipseccrypto.prt     System\Libs\ipseccrypto.prt
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // __IPSEC
 
 #endif
diff -r 39bb7c3571e9 -r e8d041006974 networksecurity/ipsec/ipseccrypto/inc/ipseccrypto.h
--- a/networksecurity/ipsec/ipseccrypto/inc/ipseccrypto.h	Mon May 03 13:58:16 2010 +0300
+++ b/networksecurity/ipsec/ipseccrypto/inc/ipseccrypto.h	Fri May 14 17:24:38 2010 +0300
@@ -24,7 +24,7 @@
 #include <networking/crypto.h>
 #ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
 #include "cryptosymmetriccipherapi.h"
-#include "cryptomacapi.h"
+#include <cryptospi/cryptomacapi.h>
 #endif // SYMBIAN_IPSEC_VOIP_SUPPORT
 
 typedef enum
diff -r 39bb7c3571e9 -r e8d041006974 networksecurity/ipsec/ipseccrypto/src/ipseccrypto_prt.cpp
--- a/networksecurity/ipsec/ipseccrypto/src/ipseccrypto_prt.cpp	Mon May 03 13:58:16 2010 +0300
+++ b/networksecurity/ipsec/ipseccrypto/src/ipseccrypto_prt.cpp	Fri May 14 17:24:38 2010 +0300
@@ -24,14 +24,14 @@
 #include <hash.h>
 
 #include "keys.h"
-#include "cryptospidef.h"
+#include <cryptospi/cryptospidef.h>
 #include "cryptosymmetriccipherapi.h"
 #ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
 #include "ruleselector.h"
 #include "plugincharacteristics.h"
 #include "cryptospistateapi.h"
 #include "cryptoparams.h"
-#include "cryptomacapi.h"
+#include <cryptospi/cryptomacapi.h>
 using namespace CryptoSpi;
 #endif // SYMBIAN_IPSEC_VOIP_SUPPORT
 
diff -r 39bb7c3571e9 -r e8d041006974 networksecurity/ipsec/ipsecpol/group/ipsecpol.iby
--- a/networksecurity/ipsec/ipsecpol/group/ipsecpol.iby	Mon May 03 13:58:16 2010 +0300
+++ b/networksecurity/ipsec/ipsecpol/group/ipsecpol.iby	Fri May 14 17:24:38 2010 +0300
@@ -22,7 +22,7 @@
 #ifndef __IPSECPOL_IBY__
 #define __IPSECPOL_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_IPSEC
+#ifndef __IPSEC
 
 REM Feature IPSECPOL not included in this rom
 
@@ -32,6 +32,6 @@
 
 file=ABI_DIR\DEBUG_DIR\ipsecpol.exe            System\Programs\ipsecpol.exe
 
-#endif // SYMBIAN_EXCLUDE_IPSEC
+#endif // __IPSEC
 
 #endif // __IPSECPOL_IBY__
\ No newline at end of file
diff -r 39bb7c3571e9 -r e8d041006974 networksecurity/tlsprovider/Test/group/TlsProvtestServer.mmp
--- a/networksecurity/tlsprovider/Test/group/TlsProvtestServer.mmp	Mon May 03 13:58:16 2010 +0300
+++ b/networksecurity/tlsprovider/Test/group/TlsProvtestServer.mmp	Fri May 14 17:24:38 2010 +0300
@@ -47,8 +47,6 @@
 SYSTEMINCLUDE 	/epoc32/include/mw
 #endif
 
-USERINCLUDE		../../../../../security/crypto/weakcrypto/inc
-
 
 LIBRARY     	euser.lib
 LIBRARY		testexecuteutils.lib
diff -r 39bb7c3571e9 -r e8d041006974 networksecurity/tlsprovider/group/swtlstokentypeplugin.mmp
--- a/networksecurity/tlsprovider/group/swtlstokentypeplugin.mmp	Mon May 03 13:58:16 2010 +0300
+++ b/networksecurity/tlsprovider/group/swtlstokentypeplugin.mmp	Fri May 14 17:24:38 2010 +0300
@@ -33,7 +33,6 @@
 SOURCE swtlstokenprovider.cpp swtlssessioncache.cpp swtlstoken_log.cpp
 
 USERINCLUDE		../inc
-USERINCLUDE		../../../../security/crypto/weakcrypto/inc
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 
diff -r 39bb7c3571e9 -r e8d041006974 networksecurity/tlsprovider/group/tlsprovider.mmp
--- a/networksecurity/tlsprovider/group/tlsprovider.mmp	Mon May 03 13:58:16 2010 +0300
+++ b/networksecurity/tlsprovider/group/tlsprovider.mmp	Fri May 14 17:24:38 2010 +0300
@@ -33,7 +33,6 @@
 SOURCE                  tlsprovider_log.cpp tlsproviderpolicy.cpp
 
 USERINCLUDE		../inc
-USERINCLUDE		../../../../security/crypto/weakcrypto/inc
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY	euser.lib  pkixcert.lib
diff -r 39bb7c3571e9 -r e8d041006974 tcpiputils/dhcp/group/DHCPServ.iby
--- a/tcpiputils/dhcp/group/DHCPServ.iby	Mon May 03 13:58:16 2010 +0300
+++ b/tcpiputils/dhcp/group/DHCPServ.iby	Fri May 14 17:24:38 2010 +0300
@@ -17,7 +17,7 @@
 #ifndef __DHCP_SERVER_IBY__
 #define __DHCP_SERVER_IBY__
 
-#ifdef SYMBIAN_EXCLUDE_DHCP
+#ifndef __DHCP
 REM Feature DHCP is not included in this ROM
 #else
 REM Static Dependencies
diff -r 39bb7c3571e9 -r e8d041006974 tcpiputils/dhcp/group/NetCfgExtnDhcp.iby
--- a/tcpiputils/dhcp/group/NetCfgExtnDhcp.iby	Mon May 03 13:58:16 2010 +0300
+++ b/tcpiputils/dhcp/group/NetCfgExtnDhcp.iby	Fri May 14 17:24:38 2010 +0300
@@ -18,7 +18,7 @@
 #ifndef GUARD_INCLUDE_NETCFGEXTNDHCP_IBY
 #define GUARD_INCLUDE_NETCFGEXTNDHCP_IBY
 
-#ifdef SYMBIAN_EXCLUDE_DHCP
+#ifndef __DHCP
 REM Feature DHCP is not included in this ROM
 #else
 #include <netstsrv.iby>
diff -r 39bb7c3571e9 -r e8d041006974 tcpiputils/dhcp/te_dhcp/te_dhcpTestServer.iby
--- a/tcpiputils/dhcp/te_dhcp/te_dhcpTestServer.iby	Mon May 03 13:58:16 2010 +0300
+++ b/tcpiputils/dhcp/te_dhcp/te_dhcpTestServer.iby	Fri May 14 17:24:38 2010 +0300
@@ -22,7 +22,7 @@
 file=ABI_DIR\DEBUG_DIR\DhcpTestServer.exe	System\bin\DhcpTestServer.exe
 
 
-#ifdef SYMBIAN_EXCLUDE_DHCP
+#ifndef __DHCP
 REM Feature DHCP is not included in this ROM
 data=\epoc32\data\z\testdata\scripts\DHCP\te_dhcpremovedtest_ip4.script			TestData\scripts\DHCP\te_dhcpremovedtest_ip4.script
 
diff -r 39bb7c3571e9 -r e8d041006974 tcpiputils/dhcp/te_unittest/dhcpservtest.mmp
--- a/tcpiputils/dhcp/te_unittest/dhcpservtest.mmp	Mon May 03 13:58:16 2010 +0300
+++ b/tcpiputils/dhcp/te_unittest/dhcpservtest.mmp	Fri May 14 17:24:38 2010 +0300
@@ -23,10 +23,9 @@
 SOURCE dhcpservtest.cpp
 USERINCLUDE ..\include
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-SYSTEMINCLUDE \epoc32\include \epoc32\include\TechView \epoc32\include\Networking
+SYSTEMINCLUDE \epoc32\include \epoc32\include\Networking
 #else
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-SYSTEMINCLUDE \epoc32\include\TechView 
 SYSTEMINCLUDE \epoc32\include\platform\Networking
 SYSTEMINCLUDE  ..\..\networkaddressandporttranslation\inc
 #endif